[Galago-commits] r1960 - in trunk/notification-daemon: . src

galago-commits at freedesktop.org galago-commits at freedesktop.org
Mon Jun 20 00:27:54 PDT 2005 

Author: chipx86
Date: 2005-06-20 00:27:50 -0700 (Mon, 20 Jun 2005)
New Revision: 1960

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/main.cpp
Log:
Check the right types depending on D-BUS version.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2005-06-20 07:24:02 UTC (rev 1959)
+++ trunk/notification-daemon/ChangeLog	2005-06-20 07:27:50 UTC (rev 1960)
@@ -1,3 +1,8 @@
+Mon Jun 20 04:03:11 PDT 2005  Christian Hammond <chipx86 at gnupdate.org>
+
+	* src/main.cpp:
+	  - Check the right types depending on D-BUS version.
+
 Mon Jun 20 03:57:40 PDT 2005  Christian Hammond <chipx86 at gnupdate.org>
 
 	* src/Makefile.am:

Modified: trunk/notification-daemon/src/main.cpp
===================================================================
--- trunk/notification-daemon/src/main.cpp	2005-06-20 07:24:02 UTC (rev 1959)
+++ trunk/notification-daemon/src/main.cpp	2005-06-20 07:27:50 UTC (rev 1960)
@@ -238,14 +238,17 @@
     /*********************************************************************
      * Actions
      *********************************************************************/
-    validate(type == DBUS_TYPE_ARRAY, NULL,
-             "Invalid notify message. Actions argument is not a array\n" );
-
 	DBusMessageIter action_iter;
 
 #if NOTIFYD_CHECK_DBUS_VERSION(0, 30)
+    validate(type == DBUS_TYPE_ARRAY, NULL,
+             "Invalid notify message. Actions argument is not an array\n" );
+
 	dbus_message_iter_recurse(&iter, &arrayiter);
 #else
+    validate(type == DBUS_TYPE_DICT, NULL,
+             "Invalid notify message. Actions argument is not a dict\n" );
+
 	dbus_message_iter_init_dict_iterator(&iter, &action_iter);
 #endif
 
@@ -292,8 +295,13 @@
     /*********************************************************************
      * Hints
      *********************************************************************/
+#if NOTIFYD_CHECK_DBUS_VERSION(0, 30)
     validate(type == DBUS_TYPE_ARRAY, NULL,
-             "Invalid notify message. Hints argument is not a array\n" );
+             "Invalid notify message. Hints argument is not an array\n" );
+#else
+    vaM.M..MCVSMmmio_928MnewmmioM
s3_generic