dbus/tools dbus-names-model.c,1.6,1.7

Colin Walters walters at freedesktop.org
Fri Jun 17 10:10:43 PDT 2005


Update of /cvs/dbus/dbus/tools
In directory gabe:/tmp/cvs-serv22420/tools

Modified Files:
	dbus-names-model.c 
Log Message:
2005-06-17  Colin Walters  <walters at verbum.org>

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


Index: dbus-names-model.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-names-model.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dbus-names-model.c	13 Jun 2005 03:01:17 -0000	1.6
+++ dbus-names-model.c	17 Jun 2005 17:10:41 -0000	1.7
@@ -65,7 +65,6 @@
   NamesModel *names_model;
   GError *error;
   char **names;
-  int n_elements;
   int i;
 
   names_model = NAMES_MODEL (data);
@@ -77,8 +76,8 @@
   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 @@
     {
       GtkTreeIter iter;
 
-      g_assert (i < n_elements);
-
 #if 0
       g_printerr ("%d of %d: %s\n",
                   i, n_elements, names[i]);



More information about the dbus-commit mailing list