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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-03-14 21:24:38 -0800 (Tue, 14 Mar 2006)
New Revision: 2599

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
   trunk/libgalago/libgalago/galago-presence.c
Log:
Properly move the D-BUS message iterator when getting the result of AddPerson, so that we don't use the object path as the UID.  This fixes bug #25.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-03-14 07:23:45 UTC (rev 2598)
+++ trunk/libgalago/ChangeLog	2006-03-15 05:24:38 UTC (rev 2599)
@@ -1,3 +1,11 @@
+Tue Mar 14 21:23:26 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	* libgalago/galago-presence.c:
+	  - Properly move the D-BUS message iterator when getting the result
+	    of AddPerson, so that we don't use the object path as the UID.
+	    This fixes bug #25.
+
 Mon Mar 13 23:11:58 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* tests/Makefile.am:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-03-14 07:23:45 UTC (rev 2598)
+++ trunk/libgalago/libgalago/galago-core.c	2006-03-15 05:24:38 UTC (rev 2599)
@@ -1416,12 +1416,11 @@
 
 	dbus_message_iter_init(reply, &iter);
 	dbus_message_iter_get_basic(&iter, &obj_path);
+	dbus_message_iter_next(&iter);
 	dbus_message_iter_get_basic(&iter, &uid);
-//	dbus_message_iter_get_basic(&iter, &session_id);
 
 	galago_object_set_dbus_path(GALAGO_OBJECT(person), obj_path);
 	_galago_person_set_id(person, uid);
-//	_galago_person_set_session_id(person, session_id);
 }
 
 static void

Modified: trunk/libgalago/libgalago/galago-presence.c
===================================================================
--- trunk/libgalago/libgalago/galago-presence.c	2006-03-14 07:23:45 UTC (rev 2598)
+++ trunk/libgalago/libgalago/galago-presence.c	2006-03-15 05:24:38 UTC (rev 2599)
@@ -255,7 +255,7 @@
 														GALAGO_TYPE_STATUS);
 
 	for (l = statuses; l != NULL; l = l->next)
-		galago_presence_add_status(presence, (GalagoStatus *)l->data);
+		galago_presence_add_status(presence, GALAGO_STATUS(l->data));
 
 	return presence;
 }