diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-21 11:56:15 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-21 11:56:15 -0600 |
| commit | 7cddccbdd648ea01f9184bc975bb762b7a032c45 (patch) | |
| tree | 38d96fd5174b1573ef3c70805b7663b8f1157dcb /libdbusmenu-glib/client.c | |
| parent | aea42d14c645517cc32611ab0e8580223948aad3 (diff) | |
| parent | 4bb9903a560f83b1b8a19c7801efab80d677ab46 (diff) | |
| download | libdbusmenu-7cddccbdd648ea01f9184bc975bb762b7a032c45.tar.gz libdbusmenu-7cddccbdd648ea01f9184bc975bb762b7a032c45.tar.bz2 libdbusmenu-7cddccbdd648ea01f9184bc975bb762b7a032c45.zip | |
Updating to trunk
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index f84d6e0..ea0f0f7 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1548,6 +1548,14 @@ parse_layout (DbusmenuClient * client, const gchar * layout) static void update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data) { + DbusmenuClient * client = DBUSMENU_CLIENT(data); + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); + + if (priv->layoutcall != NULL) { + g_object_unref(priv->layoutcall); + priv->layoutcall = NULL; + } + GError * error = NULL; GVariant * params = NULL; @@ -1564,9 +1572,6 @@ update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data) g_variant_get(params, "(us)", &rev, &xml); g_variant_unref(params); - DbusmenuClient * client = DBUSMENU_CLIENT(data); - DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); - guint parseable = parse_layout(client, xml); g_free(xml); @@ -1577,10 +1582,6 @@ update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data) priv->my_revision = rev; /* g_debug("Root is now: 0x%X", (unsigned int)priv->root); */ - if (priv->layoutcall != NULL) { - g_object_unref(priv->layoutcall); - priv->layoutcall = NULL; - } #ifdef MASSIVEDEBUGGING g_debug("Client signaling layout has changed."); #endif |