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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-20 03:15:06 -0800 (Sun, 20 Nov 2005)
New Revision: 2335

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-dbus.c
   trunk/libgalago/libgalago/galago-dbus.h
   trunk/libgalago/libgalago/galago-presence.c
Log:
galago_dbus_message_iter_append_object_list() now requires a GType.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2005-11-20 11:04:39 UTC (rev 2334)
+++ trunk/libgalago/ChangeLog	2005-11-20 11:15:06 UTC (rev 2335)
@@ -1,3 +1,10 @@
+Sun Nov 20 03:14:49 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-dbus.c:
+	* libgalago/galago-dbus.h:
+	* libgalago/galago-presence.c:
+	  - galago_dbus_message_iter_append_object_list() now requires a GType.
+
 Sun Nov 20 03:03:46 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-object.c:

Modified: trunk/libgalago/libgalago/galago-dbus.c
===================================================================
--- trunk/libgalago/libgalago/galago-dbus.c	2005-11-20 11:04:39 UTC (rev 2334)
+++ trunk/libgalago/libgalago/galago-dbus.c	2005-11-20 11:15:06 UTC (rev 2335)
@@ -82,7 +82,8 @@
 }
 
 void
-galago_dbus_message_iter_append_object_list(DBusMessageIter *iter, GList *list)
+galago_dbus_message_iter_append_object_list(DBusMessageIter *iter, GType type,
+											GList *list)
 {
 	GList *l;
 	guint num_objects;
@@ -211,7 +212,8 @@
 					galago_value_get_object(temp_value));
 			}
 
-			galago_dbus_message_iter_append_object_list(iter, list);
+			galago_dbus_message_iter_append_object_list(iter,
+				galago_value_get_gtype(value), list);
 			g_list_free(list);
 			break;
 

Modified: trunk/libgalago/libgalago/galago-dbus.h
===================================================================
--- trunk/libgalago/libgalago/galago-dbus.h	2005-11-20 11:04:39 UTC (rev 2334)
+++ trunk/libgalago/libgalago/galago-dbus.h	2005-11-20 11:15:06 UTC (rev 2335)
@@ -72,10 +72,11 @@
  * Appends a list of objects to a D-BUS message.
  *
  * @param iter The D-BUS message iterator.
+ * @param type The type of the objects inside.
  * @param list The list of objects to append.
  */
 void galago_dbus_message_iter_append_object_list(DBusMessageIter *iter,
-												 GList *list);
+												 GType type, GList *list);
 
 /**
  * Returns an object of the specified type from a D-BUS message.

Modified: trunk/libgalago/libgalago/galago-presence.c
===================================================================
--- trunk/libgalago/libgalago/galago-presence.c	2005-11-20 11:04:39 UTC (rev 2334)
+++ trunk/libgalago/libgalago/galago-presence.c	2005-11-20 11:15:06 UTC (rev 2335)
@@ -216,7 +216,7 @@
 	idle_time = galago_presence_get_idle_time(presence);
 	dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &idle_time);
 
-	galago_dbus_message_iter_append_object_list(iter,
+	galago_dbus_message_iter_append_object_list(iter, GALAGO_TYPE_STATUS,
 		galago_presence_get_statuses(presence));
 }