[Galago-commits] r2340 - in trunk/galago-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-20 03:50:45 -0800 (Sun, 20 Nov 2005)
New Revision: 2340

Modified:
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/core.c
   trunk/galago-daemon/src/person.c
Log:
More minor migration to D-BUS 0.3x.


Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2005-11-20 11:44:35 UTC (rev 2339)
+++ trunk/galago-daemon/ChangeLog	2005-11-20 11:50:45 UTC (rev 2340)
@@ -1,3 +1,9 @@
+Sun Nov 20 03:46:59 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/core.c:
+	* src/person.c:
+	  - More minor migration to D-BUS 0.3x.
+
 Sun Nov 20 03:15:07 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/account.c:

Modified: trunk/galago-daemon/src/core.c
===================================================================
--- trunk/galago-daemon/src/core.c	2005-11-20 11:44:35 UTC (rev 2339)
+++ trunk/galago-daemon/src/core.c	2005-11-20 11:50:45 UTC (rev 2340)
@@ -497,8 +497,6 @@
 {
 	DBusMessageIter iter;
 
-	/* TODO: Handle the correct signals in D-BUS 0.23 and 0.33 */
-
 	if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
 							   "ServiceDeleted"))
 	{

Modified: trunk/galago-daemon/src/person.c
===================================================================
--- trunk/galago-daemon/src/person.c	2005-11-20 11:44:35 UTC (rev 2339)
+++ trunk/galago-daemon/src/person.c	2005-11-20 11:50:45 UTC (rev 2340)
@@ -209,15 +209,9 @@
 
 	if (value == NULL)
 	{
-		/* TODO: Use dbus_message_new_error_printf when moving to 0.3x */
-		char *buffer = g_strdup_printf("The property \"%s\" is invalid.",
-									   name);
-
-		reply = dbus_message_new_error(message,
+		reply = dbus_message_new_error_printf(message,
 			GALAGO_DBUS_ERROR_INVALID_PROPERTY,
-			buffer);
-
-		g_free(buffer);
+			"The property \"%s\" is invalid.", name);
 	}
 	else
 	{