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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-19 16:19:07 -0800 (Sat, 19 Nov 2005)
New Revision: 2327

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-person.c
Log:
Properly create a "me" person when being sent one. Also, I think I accidentally fixed a bug in person signatures.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2005-11-19 23:57:08 UTC (rev 2326)
+++ trunk/libgalago/ChangeLog	2005-11-20 00:19:07 UTC (rev 2327)
@@ -1,3 +1,9 @@
+Sat Nov 19 16:18:38 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-person.c:
+	  - Properly create a "me" person when being sent one. Also, I think
+	    I accidentally fixed a bug in person signatures.
+
 Sat Nov 19 15:56:04 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-dbus.c:

Modified: trunk/libgalago/libgalago/galago-person.c
===================================================================
--- trunk/libgalago/libgalago/galago-person.c	2005-11-19 23:57:08 UTC (rev 2326)
+++ trunk/libgalago/libgalago/galago-person.c	2005-11-20 00:19:07 UTC (rev 2327)
@@ -250,7 +250,8 @@
 galago_person_dbus_message_get(DBusMessageIter *iter)
 {
 	GalagoPerson *person;
-	char *obj_path, *id;
+	const char *obj_path, *id;
+	gboolean me;
 
 	dbus_message_iter_get_basic(iter, &obj_path);
 	dbus_message_iter_next(iter);
@@ -258,6 +259,11 @@
 	dbus_message_iter_get_basic(iter, &id);
 	dbus_message_iter_next(iter);
 
+	dbus_message_iter_get_basic(iter, &me);
+
+	if (me)
+		id = GALAGO_ME_ID;
+
 	person = _galago_create_person_common(id, GALAGO_REMOTE, obj_path);
 
 	return person;