[Galago-commits] r2328 - in trunk/galago-daemon: . src

[galago-commits at freedesktop.org]

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

Modified:
   trunk/galago-daemon/ChangeLog
   trunk/galago-daemon/src/core.c
Log:
Append an actual D-BUS array of services in GetServices and of people in GetPeople.


Modified: trunk/galago-daemon/ChangeLog
===================================================================
--- trunk/galago-daemon/ChangeLog	2005-11-20 00:19:07 UTC (rev 2327)
+++ trunk/galago-daemon/ChangeLog	2005-11-20 00:19:43 UTC (rev 2328)
@@ -1,3 +1,9 @@
+Sat Nov 19 16:19:19 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/core.c:
+	  - Append an actual D-BUS array of services in GetServices and of
+	    people in GetPeople.
+
 Sat Nov 19 15:00:45 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/person.c:

Modified: trunk/galago-daemon/src/core.c
===================================================================
--- trunk/galago-daemon/src/core.c	2005-11-20 00:19:07 UTC (rev 2327)
+++ trunk/galago-daemon/src/core.c	2005-11-20 00:19:43 UTC (rev 2328)
@@ -276,27 +276,29 @@
 core_get_services(DBusConnection *dbus_conn, DBusMessage *message)
 {
 	DBusMessage *reply;
-	DBusMessageIter iter;
+	DBusMessageIter iter, array_iter;
 	const GList *l;
-	size_t service_count;
 	GalagodMetaService *meta_service;
 	GalagoService *service;
 
-	service_count = galagod_services_get_meta_service_count();
-
 	reply = dbus_message_new_method_return(message);
 
 	dbus_message_iter_init_append(reply, &iter);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT32, &service_count);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+		galago_object_type_get_dbus_signature(GALAGO_TYPE_SERVICE),
+		&array_iter);
 
 	for (l = galagod_services_get_meta_services(); l != NULL; l = l->next)
 	{
 		meta_service = (GalagodMetaService *)l->data;
 		service      = galagod_meta_service_get_service(meta_service);
 
-		galago_dbus_message_iter_append_object(&iter, GALAGO_OBJECT(service));
+		galago_dbus_message_iter_append_object(&array_iter,
+											   GALAGO_OBJECT(service));
 	}
 
+	dbus_message_iter_close_container(&iter, &array_iter);
+
 	dbus_connection_send(dbus_conn, reply, NULL);
 	dbus_message_unref(reply);
 
@@ -397,7 +399,7 @@
 core_get_people(DBusConnection *dbus_conn, DBusMessage *message)
 {
 	DBusMessage *reply;
-	DBusMessageIter iter;
+	DBusMessageIter iter, array_iter;
 	const GList *l;
 	size_t person_count;
 	GalagodMetaPerson *meta_person;
@@ -408,16 +410,21 @@
 	reply = dbus_message_new_method_return(message);
 
 	dbus_message_iter_init_append(reply, &iter);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT32, &person_count);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+		galago_object_type_get_dbus_signature(GALAGO_TYPE_PERSON),
+		&array_iter);
 
 	for (l = galagod_people_get_meta_people(); l != NULL; l = l->next)
 	{
 		meta_person = (GalagodMetaPerson *)l->data;
 		person      = galagod_meta_person_get_person(meta_person);
 
-		galago_dbus_message_iter_append_object(&iter, GALAGO_OBJECT(person));
+		galago_dbus_message_iter_append_object(&array_iter,
+											   GALAGO_OBJECT(person));
 	}
 
+	dbus_message_iter_close_container(&iter, &array_iter);
+
 	dbus_connection_send(dbus_conn, reply, NULL);
 	dbus_message_unref(reply);