aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-14 15:22:13 -0500
committerTed Gould <ted@canonical.com>2009-09-14 15:22:13 -0500
commit3001169e680b13db6ae4d88bec9fa750ae8b02ce (patch)
treecf45b7247d542204a40b1cf31f12bf2dafa179c5 /libdbusmenu-glib
parentf10791150364c9fd23254b97c8a5eb88a938aad4 (diff)
parent8ed8669ff511a203881ffe6912ada2be99a4b5d9 (diff)
downloadlibdbusmenu-3001169e680b13db6ae4d88bec9fa750ae8b02ce.tar.gz
libdbusmenu-3001169e680b13db6ae4d88bec9fa750ae8b02ce.tar.bz2
libdbusmenu-3001169e680b13db6ae4d88bec9fa750ae8b02ce.zip
Fixing looking for the root while we're looking.
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;
}