[Galago-commits] r2565 - in branches/libgalago/protocol-cleanup: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-07 01:38:37 -0800 (Tue, 07 Feb 2006)
New Revision: 2565

Modified:
   branches/libgalago/protocol-cleanup/ChangeLog
   branches/libgalago/protocol-cleanup/libgalago/galago-core.c
   branches/libgalago/protocol-cleanup/libgalago/galago-service.c
Log:
Pass the correct values to galago_get_people() and galago_get_services(). This is another case of passing TRUE/FALSE when an enum value should have been passed.


Modified: branches/libgalago/protocol-cleanup/ChangeLog
===================================================================
--- branches/libgalago/protocol-cleanup/ChangeLog	2006-02-07 09:04:32 UTC (rev 2564)
+++ branches/libgalago/protocol-cleanup/ChangeLog	2006-02-07 09:38:37 UTC (rev 2565)
@@ -1,3 +1,11 @@
+Tue Feb 07 01:37:12 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	* libgalago/galago-service.c:
+	  - Pass the correct values to galago_get_people() and
+	    galago_get_services(). This is another case of passing TRUE/FALSE
+	    when an enum value should have been passed.
+
 Tue Feb 07 01:04:02 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* tests/check-libgalago.c:

Modified: branches/libgalago/protocol-cleanup/libgalago/galago-core.c
===================================================================
--- branches/libgalago/protocol-cleanup/libgalago/galago-core.c	2006-02-07 09:04:32 UTC (rev 2564)
+++ branches/libgalago/protocol-cleanup/libgalago/galago-core.c	2006-02-07 09:38:37 UTC (rev 2565)
@@ -288,17 +288,17 @@
 	if (!galago_is_feed())
 		return;
 
-	for (l = galago_get_people(TRUE, FALSE); l != NULL; l = l->next)
+	for (l = galago_get_people(GALAGO_LOCAL, FALSE); l != NULL; l = l->next)
 	{
-		GalagoPerson *person = (GalagoPerson *)l->data;
+		GalagoPerson *person = GALAGO_PERSON(l->data);
 
 		_galago_dbus_core_add_person(person);
 		galago_dbus_object_push_full(GALAGO_OBJECT(person));
 	}
 
-	for (l = galago_get_services(TRUE, FALSE); l != NULL; l = l->next)
+	for (l = galago_get_services(GALAGO_LOCAL, FALSE); l != NULL; l = l->next)
 	{
-		GalagoService *service = (GalagoService *)l->data;
+		GalagoService *service = GALAGO_SERVICE(l->data);
 
 		_galago_dbus_core_add_service(service);
 		galago_dbus_object_push_full(GALAGO_OBJECT(service));
@@ -1385,6 +1385,8 @@
 
 	g_signal_emit(_core, signals[PERSON_ADDED], 0, person);
 
+	printf("Attempting to call AddPerson %p (%s)\n", person,
+		   galago_person_get_id(person));
 	if (!galago_is_connected() || !galago_is_feed() ||
 		GALAGO_OBJECT_IS_REMOTE(person))
 	{
@@ -1405,6 +1407,7 @@
 	dbus_message_iter_init_append(message, &iter);
 	galago_dbus_message_iter_append_object(&iter, GALAGO_OBJECT(person));
 
+	printf("Called AddPerson\n");
 	dbus_error_init(&error);
 	reply = dbus_connection_send_with_reply_and_block(dbus_conn, message, -1,
 													  &error);

Modified: branches/libgalago/protocol-cleanup/libgalago/galago-service.c
===================================================================
--- branches/libgalago/protocol-cleanup/libgalago/galago-service.c	2006-02-07 09:04:32 UTC (rev 2564)
+++ branches/libgalago/protocol-cleanup/libgalago/galago-service.c	2006-02-07 09:38:37 UTC (rev 2565)
@@ -230,7 +230,7 @@
 static void
 galago_service_dbus_push_full(GalagoObject *object)
 {
-	GalagoService *service = (GalagoService *)object;
+	GalagoService *service = GALAGO_SERVICE(object);
 	GalagoAccount *account;
 	GList *l;
 
@@ -248,7 +248,7 @@
 	{
 		account = (GalagoAccount *)l->data;
 
-		galago_dbus_object_push_full(GALAGO_OBJECT(account));
+		galago_dbus_object_push_full(GALAGO_OBJECT(l->data));
 	}
 }
 
@@ -652,6 +652,9 @@
 {
 	char *obj_path;
 
+	g_assert(service != NULL);
+	g_assert(account != NULL);
+
 	if (!galago_is_connected() || !galago_is_feed())
 		return;