diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-09 14:51:00 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-09 14:51:00 -0600 |
| commit | 969add38b333138095850f3dc9cbd701954b49b6 (patch) | |
| tree | 4ea0be956db82944884225766903fe78c439895b /libdbusmenu-glib | |
| parent | bc29c3e31adbed4dd2b93c1a461da9936b54456c (diff) | |
| download | libdbusmenu-969add38b333138095850f3dc9cbd701954b49b6.tar.gz libdbusmenu-969add38b333138095850f3dc9cbd701954b49b6.tar.bz2 libdbusmenu-969add38b333138095850f3dc9cbd701954b49b6.zip | |
Fixing the proxies correctly and making sure to reset the call pointer.
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 81c9a2c..264eb77 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -216,7 +216,7 @@ dbusmenu_client_dispose (GObject *object) DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(object); if (priv->layoutcall != NULL) { - dbus_g_proxy_cancel_call(priv->propproxy, priv->layoutcall); + dbus_g_proxy_cancel_call(priv->menuproxy, priv->layoutcall); priv->layoutcall = NULL; } if (priv->menuproxy != NULL) { @@ -794,6 +794,7 @@ update_layout_cb (DBusGProxy * proxy, guint rev, gchar * xml, GError * error, vo priv->my_revision = rev; /* g_debug("Root is now: 0x%X", (unsigned int)priv->root); */ + priv->layoutcall = NULL; #ifdef MASSIVEDEBUGGING g_debug("Client signaling layout has changed."); #endif @@ -813,7 +814,7 @@ update_layout (DbusmenuClient * client) { DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); - if (priv->propproxy == NULL) { + if (priv->menuproxy == NULL) { return; } |