ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
------------------------------------------------------------
revno: 15 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-09-11 14:29:01 -0500
message:
  Applying a fix by not blocking if we're calling for the root.  Everyone should be listening for root changes anyway.
modified:
  libdbusmenu-glib/client.c


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription.

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2009-08-27 13:36:58 +0000
+++ libdbusmenu-glib/client.c	2009-09-11 16:56:07 +0000
@@ -803,10 +803,16 @@
 		return NULL;
 	}
 
+#if 0
+/* Seems to be a bug in dbus-glib that assert here, I think because
+   multiple people try and grab it.  We're going to comment this out
+   for now as everyone should be listening to the root changed signal
+   anyway. */
 	if (priv->layoutcall != NULL) {
 		/* Will end the current call and block on it's completion */
 		update_layout_cb(priv->propproxy, priv->layoutcall, client);
 	}
+#endif
 
 	return priv->root;
 }