diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-15 15:20:38 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-15 15:20:38 -0600 |
| commit | e911ad73aadd6cb2cb58771a750df1e600613c08 (patch) | |
| tree | 0a5cffecb63f4c481d9b4d528934f933a0d80381 | |
| parent | cbabf67cabb66079fa89d3972fea2aaee9543b5e (diff) | |
| download | libdbusmenu-e911ad73aadd6cb2cb58771a750df1e600613c08.tar.gz libdbusmenu-e911ad73aadd6cb2cb58771a750df1e600613c08.tar.bz2 libdbusmenu-e911ad73aadd6cb2cb58771a750df1e600613c08.zip | |
Completely change layoutcall to be a GCancellable
| -rw-r--r-- | libdbusmenu-glib/client.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index c206e47..51113f0 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -360,7 +360,8 @@ dbusmenu_client_dispose (GObject *object) } if (priv->layoutcall != NULL) { - dbus_g_proxy_cancel_call(priv->menuproxy, priv->layoutcall); + g_cancellable_cancel(priv->layoutcall); + g_object_unref(priv->layoutcall); priv->layoutcall = NULL; } @@ -890,7 +891,11 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata) } if ((gpointer)priv->menuproxy == (gpointer)gobj_proxy) { - priv->layoutcall = NULL; + if (priv->layoutcall != NULL) { + g_cancellable_cancel(priv->layoutcall); + g_object_unref(priv->layoutcall); + priv->layoutcall = NULL; + } } priv->current_revision = 0; @@ -1574,7 +1579,10 @@ update_layout_cb (GDBusProxy * 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; + if (priv->layoutcall != NULL) { + g_object_unref(priv->layoutcall); + priv->layoutcall = NULL; + } #ifdef MASSIVEDEBUGGING g_debug("Client signaling layout has changed."); #endif @@ -1604,7 +1612,9 @@ update_layout (DbusmenuClient * client) return; } - priv->layoutcall = org_ayatana_dbusmenu_get_layout_async(priv->menuproxy, + priv->layoutcall = g_cancellable_new(); + + org_ayatana_dbusmenu_get_layout_async(priv->menuproxy, 0, /* Parent is the root */ update_layout_cb, client); |