diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-11 14:29:01 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-11 14:29:01 -0500 |
| commit | 8ed8669ff511a203881ffe6912ada2be99a4b5d9 (patch) | |
| tree | 2d0e6503c033db337ff73773f53109dd9cd60ee6 | |
| parent | 3319ee231d2c458ad2d8a008ac2020b1ebd2582a (diff) | |
| parent | c9af096ec81002c51004160239dea651d0823b63 (diff) | |
| download | libdbusmenu-8ed8669ff511a203881ffe6912ada2be99a4b5d9.tar.gz libdbusmenu-8ed8669ff511a203881ffe6912ada2be99a4b5d9.tar.bz2 libdbusmenu-8ed8669ff511a203881ffe6912ada2be99a4b5d9.zip | |
Applying a fix by not blocking if we're calling for the root. Everyone should be listening for root changes anyway.
| -rw-r--r-- | libdbusmenu-glib/client.c | 6 |
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; } |