[Galago-commits] r2325 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-19 15:51:34 -0800 (Sat, 19 Nov 2005)
New Revision: 2325

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-account.c
   trunk/libgalago/libgalago/galago-object.c
Log:
Fix the core problem with signature retrieval. != != ==.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2005-11-19 23:48:13 UTC (rev 2324)
+++ trunk/libgalago/ChangeLog	2005-11-19 23:51:34 UTC (rev 2325)
@@ -1,3 +1,9 @@
+Sat Nov 19 15:51:11 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-account.c:
+	* libgalago/galago-object.c:
+	  - Fix the core problem with signature retrieval. != != ==.
+
 Sat Nov 19 15:47:48 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* tests/check-libgalago.c:

Modified: trunk/libgalago/libgalago/galago-account.c
===================================================================
--- trunk/libgalago/libgalago/galago-account.c	2005-11-19 23:48:13 UTC (rev 2324)
+++ trunk/libgalago/libgalago/galago-account.c	2005-11-19 23:51:34 UTC (rev 2325)
@@ -355,21 +355,13 @@
 static gchar *
 galago_account_dbus_get_signature(void)
 {
-	const gchar *service_sig;
-	const gchar *person_sig;
-	gchar *sig;
-
-	service_sig = galago_object_type_get_dbus_signature(GALAGO_TYPE_SERVICE);
-	person_sig  = galago_object_type_get_dbus_signature(GALAGO_TYPE_PERSON);
-
-	sig = g_strconcat(service_sig,                 // service,
-					  person_sig,                  // person,
-					  DBUS_TYPE_STRING_AS_STRING,  // username
-					  DBUS_TYPE_STRING_AS_STRING,  // display name
-					  DBUS_TYPE_BOOLEAN_AS_STRING, // connected
-					  NULL);
-
-	return sig;
+	return g_strconcat(
+		galago_object_type_get_dbus_signature(GALAGO_TYPE_SERVICE), // service
+		galago_object_type_get_dbus_signature(GALAGO_TYPE_PERSON),  // person
+		DBUS_TYPE_STRING_AS_STRING,  // username
+		DBUS_TYPE_STRING_AS_STRING,  // display name
+		DBUS_TYPE_BOOLEAN_AS_STRING, // connected
+		NULL);
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-object.c
===================================================================
--- trunk/libgalago/libgalago/galago-object.c	2005-11-19 23:48:13 UTC (rev 2324)
+++ trunk/libgalago/libgalago/galago-object.c	2005-11-19 23:51:34 UTC (rev 2325)
@@ -201,7 +201,7 @@
 
 	klass = g_type_class_ref(type);
 
-	if (klass->dbus_get_signature != NULL)
+	if (klass->dbus_get_signature == NULL)
 	{
 		g_type_class_unref(klass);
 		return NULL;