aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-09-17 13:18:36 -0400
committerKen VanDine <ken.vandine@canonical.com>2009-09-17 13:18:36 -0400
commit6c75099b24d3f9c47a4a6035bf234b1fed42d200 (patch)
treef5c97421e8491bdd41732fd197175eef7bc706bf /libdbusmenu-glib
parent3d9c30c450fd7b7af4a28ccc285bdc0e8fc59506 (diff)
parentd5e9c76356c26c7684771cba7613b3928b9b2c80 (diff)
downloadlibdbusmenu-6c75099b24d3f9c47a4a6035bf234b1fed42d200.tar.gz
libdbusmenu-6c75099b24d3f9c47a4a6035bf234b1fed42d200.tar.bz2
libdbusmenu-6c75099b24d3f9c47a4a6035bf234b1fed42d200.zip
Upstream release (LP: #432003)
Diffstat (limited to 'libdbusmenu-glib')
-rw-r--r--libdbusmenu-glib/client.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index dd2254e..4ae4f75 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -803,10 +803,16 @@ dbusmenu_client_get_root (DbusmenuClient * client)
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;
}