3 files changed, 46 insertions, 0 deletions
diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c
index cac774ce..69875703 100644
--- a/test/glib/test-dbus-glib.c
+++ b/test/glib/test-dbus-glib.c
@@ -195,6 +195,7 @@ echo_received_cb (DBusGProxy *proxy,
     lose_gerror ("Failed to complete async Echo", error);
   g_assert (echo_data != NULL);
   g_print ("Async echo gave \"%s\"", echo_data); 
+  g_free (echo_data);
   g_main_loop_quit (loop);
   g_source_remove (exit_timeout);
 }
@@ -899,6 +900,34 @@ main (int argc, char **argv)
 
   run_mainloop ();
 
+  {
+    GPtrArray *objs;
+    guint i;
+
+    g_print ("Calling GetObjs\n");
+
+    if (!dbus_g_proxy_call (proxy, "GetObjs", &error, G_TYPE_INVALID,
+			    dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH),
+			    &objs,
+			    G_TYPE_INVALID))
+      lose_gerror ("Failed to complete GetObjs call", error);
+    if (objs->len != 2)
+      lose ("GetObjs call returned unexpected number of objects %d, expected 2",
+	    objs->len);
+
+    if (strcmp ("/org/freedesktop/DBus/Tests/MyTestObject",
+		g_ptr_array_index (objs, 0)) != 0)
+      lose ("GetObjs call returned unexpected path \"%s\" in position 0; expected /org/freedesktop/DBus/Tests/MyTestObject", (char*) g_ptr_array_index (objs, 0));
+
+    if (strcmp ("/org/freedesktop/DBus/Tests/MyTestObject2",
+		g_ptr_array_index (objs, 1)) != 0)
+      lose ("GetObjs call returned unexpected path \"%s\" in position 1; expected /org/freedesktop/DBus/Tests/MyTestObject2", (char*) g_ptr_array_index (objs, 1));
+
+    for (i = 0; i < objs->len; i++)
+      g_free (g_ptr_array_index (objs, i));
+    g_ptr_array_free (objs, TRUE);
+  }
+
   /* Signal handling tests */
   
   g_print ("Testing signal handling\n");
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c
index 84b57c68..a9e57926 100644
--- a/test/glib/test-service-glib.c
+++ b/test/glib/test-service-glib.c
@@ -65,6 +65,8 @@ gboolean my_object_recursive2 (MyObject *obj, guint32 reqlen, GArray **array, GE
 
 gboolean my_object_objpath (MyObject *obj, const char *in, char **arg1, GError **error);
 
+gboolean my_object_get_objs (MyObject *obj, GPtrArray **objs, GError **error);
+
 gboolean my_object_stringify (MyObject *obj, GValue *value, char **ret, GError **error);
 gboolean my_object_unstringify (MyObject *obj, const char *str, GValue *value, GError **error);
 
@@ -410,6 +412,17 @@ my_object_objpath (MyObject *obj, const char *incoming, char **outgoing, GError
   return TRUE;
 }
 
+gboolean
+my_object_get_objs (MyObject *obj, GPtrArray **objs, GError **error)
+{
+  *objs = g_ptr_array_new ();
+
+  g_ptr_array_add (*objs, g_strdup ("/org/freedesktop/DBus/Tests/MyTestObject"));
+  g_ptr_array_add (*objs, g_strdup ("/org/freedesktop/DBus/Tests/MyTestObject2"));
+
+  return TRUE;
+}
+
 static void
 hash_foreach (gpointer key, gpointer val, gpointer user_data)
 {
diff --git a/test/glib/test-service-glib.xml b/test/glib/test-service-glib.xml
index 58058626..272f7b23 100644
--- a/test/glib/test-service-glib.xml
+++ b/test/glib/test-service-glib.xml
@@ -74,6 +74,10 @@
       <arg type="o" direction="out"/>
     </method>
 
+    <method name="GetObjs">
+      <arg type="ao" direction="out"/>
+    </method>
+
     <method name="IncrementVal">
     </method>