diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | tools/dbus-names-model.c | 7 |
2 files changed, 7 insertions, 5 deletions
@@ -1,5 +1,10 @@ 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 spew warnings if we get malformed remote signals. diff --git a/tools/dbus-names-model.c b/tools/dbus-names-model.c index 01f7c4e8..b1ea24eb 100644 --- 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]); |