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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-09 20:20:14 -0800 (Mon, 09 Jan 2006)
New Revision: 2393

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-person.c
Log:
id -> uid for GalagoPerson.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-01-09 19:14:10 UTC (rev 2392)
+++ trunk/libgalago/ChangeLog	2006-01-10 04:20:14 UTC (rev 2393)
@@ -1,3 +1,8 @@
+Mon Jan 09 20:19:33 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-person.c:
+	  - id -> uid for GalagoPerson.
+
 Wed Dec 14 00:57:24 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-account.c:

Modified: trunk/libgalago/libgalago/galago-person.c
===================================================================
--- trunk/libgalago/libgalago/galago-person.c	2006-01-09 19:14:10 UTC (rev 2392)
+++ trunk/libgalago/libgalago/galago-person.c	2006-01-10 04:20:14 UTC (rev 2393)
@@ -242,13 +242,13 @@
 galago_person_dbus_message_get(DBusMessageIter *iter)
 {
 	GalagoPerson *person;
-	const char *obj_path, *id;
+	const char *obj_path, *uid;
 	gboolean me;
 
 	dbus_message_iter_get_basic(iter, &obj_path);
 	dbus_message_iter_next(iter);
 
-	dbus_message_iter_get_basic(iter, &id);
+	dbus_message_iter_get_basic(iter, &uid);
 	dbus_message_iter_next(iter);
 
 	dbus_message_iter_get_basic(iter, &me);
@@ -256,7 +256,7 @@
 	if (me)
 		id = GALAGO_ME_ID;
 
-	person = _galago_create_person_common(id, GALAGO_REMOTE, obj_path);
+	person = _galago_create_person_common(uid, GALAGO_REMOTE, obj_path);
 
 	return person;
 }
@@ -331,22 +331,22 @@
  * GalagoPerson API
  **************************************************************************/
 static GalagoPerson *
-_galago_create_person_common(const char *id, GalagoOrigin origin,
+_galago_create_person_common(const char *uid, GalagoOrigin origin,
 							 const char *obj_path)
 {
 	GalagoPerson *person;
 
-	g_return_val_if_fail(galago_is_initted(),       NULL);
-	g_return_val_if_fail(id != NULL && *id != '\0', NULL);
+	g_return_val_if_fail(galago_is_initted(),         NULL);
+	g_return_val_if_fail(uid != NULL && *uid != '\0', NULL);
 
-	person = galago_context_get_person(id, origin);
+	person = galago_context_get_person(uid, origin);
 
 	if (person == NULL)
 	{
 		const char *obj_prefix;
 
 		person = g_object_new(GALAGO_TYPE_PERSON,
-							  "id", id,
+							  "id", uid,
 							  "origin", origin,
 							  NULL);
 
@@ -362,7 +362,7 @@
 			if (!strcmp(id, GALAGO_ME_ID))
 				escaped_id = GALAGO_ME_ID;
 			else
-				escaped_id = galago_dbus_normalize_name(id);
+				escaped_id = galago_dbus_normalize_name(iuid);
 
 			new_obj_path = g_strdup_printf("%s/people/%s",
 										   obj_prefix, escaped_id);
@@ -379,12 +379,12 @@
 }
 
 GalagoPerson *
-galago_create_person(const char *id)
+galago_create_person(const char *uid)
 {
-	g_return_val_if_fail(galago_is_initted(),       NULL);
-	g_return_val_if_fail(id != NULL && *id != '\0', NULL);
+	g_return_val_if_fail(galago_is_initted(),         NULL);
+	g_return_val_if_fail(uid != NULL && *uid != '\0', NULL);
 
-	return _galago_create_person_common(id, GALAGO_LOCAL, NULL);
+	return _galago_create_person_common(uid, GALAGO_LOCAL, NULL);
 }
 
 void