Removing the flush. It seems to be broken in GDBus and I can't fix it.

1 files changed, 1 insertions, 21 deletions

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 7a6d87c..454e8bb 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -549,6 +549,7 @@ get_properties_callback (GObject *obj, GAsyncResult * res, gpointer user_data)
 	for (i = 0; i < listeners->len; i++) {
 		properties_listener_t * listener = &g_array_index(listeners, properties_listener_t, i);
 		if (!listener->replied) {
+			g_warning("Generating properties error for: %d", listener->id);
 			if (localerror == NULL) {
 				g_set_error_literal(&localerror, error_domain(), 0, "Error getting properties for ID");
 			}
@@ -625,21 +626,6 @@ get_properties_idle (gpointer user_data)
 	return FALSE;
 }
 
-/* Report and error if we're unable to flush the connection, likely
-   to be a cause of some other issues. */
-static void
-connection_flush_cb (GObject * object, GAsyncResult * result, gpointer user_data)
-{
-	GError * error = NULL;
-
-	if (!g_dbus_connection_flush_finish(G_DBUS_CONNECTION(object), result, &error)) {
-		g_warning("Unable to flush DBus connection: %s", error->message);
-		g_error_free(error);
-	}
-
-	return;
-}
-
 /* Forces a call out to start getting properties with the menu items
    that we have queued up already. */
 static void
@@ -656,12 +642,6 @@ get_properties_flush (DbusmenuClient * client)
 
 	get_properties_idle(client);
 
-	/* I'm not sure this flush is necissary with GDBus running the
-	   DBus connection in another thread.  But, I don't think that
-	   it'll hurt anything either, so I'm leaving it in. */
-	g_return_if_fail(priv->session_bus != NULL);
-	g_dbus_connection_flush(priv->session_bus, NULL, connection_flush_cb, NULL);
-
 	return;
 }