2005-06-17 Colin Walters <walters@verbum.org>

	* tools/dbus-names-model.c (have_names_notify): Fix call
	to dbus_g_proxy_end_call.

diff --git a/ChangeLog b/ChangeLog
index 8b4f8796330b0162f454ec2b6106c6c97a5690d0..6c7d3b9060a8987c6d0f969a6a5150563bf59a15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-17  Colin Walters  <walters@verbum.org>
+
+       * tools/dbus-names-model.c (have_names_notify): Fix call
+       to dbus_g_proxy_end_call.
+       
 2005-06-17  Colin Walters  <walters@verbum.org>
 
        * glib/dbus-gproxy.c (dbus_g_proxy_emit_remote_signal): Don't

diff --git a/tools/dbus-names-model.c b/tools/dbus-names-model.c
index 01f7c4e8fa2225ed8fd3ac18cd3eca9a7a055854..b1ea24ebaaaf106930715e7db668a4a18d252914 100644 (file)
--- a/tools/dbus-names-model.c
+++ b/tools/dbus-names-model.c
@@ -65,7 +65,6 @@ have_names_notify (DBusGPendingCall *call,
   NamesModel *names_model;
   GError *error;
   char **names;
-  int n_elements;
   int i;
 
   names_model = NAMES_MODEL (data);
@@ -77,8 +76,8 @@ have_names_notify (DBusGPendingCall *call,
   error = NULL;
   if (!dbus_g_proxy_end_call (names_model->driver_proxy,
                               names_model->pending_list_names,
-                              &error, G_TYPE_STRV,
-                              &names, &n_elements, G_TYPE_INVALID))
+                              &error,
+                             G_TYPE_STRV, &names, G_TYPE_INVALID))
     {
       g_assert (names == NULL);
       g_assert (error != NULL);
@@ -93,8 +92,6 @@ have_names_notify (DBusGPendingCall *call,
     {
       GtkTreeIter iter;
 
-      g_assert (i < n_elements);
-
 #if 0
       g_printerr ("%d of %d: %s\n",
                   i, n_elements, names[i]);