diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-04-19 15:49:33 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-04-19 15:49:33 -0400 |
| commit | 565603d992afa03da6a8f485fcdbe8b71677f7db (patch) | |
| tree | 46722ef17258261914a60599491ef4854159f108 | |
| parent | c8f26ed9fc6b95ce0f7e5efe33ce6006ea3a60e4 (diff) | |
| parent | 5b2d118d974dc2af45429cfd64007cd60c85e253 (diff) | |
| download | libdbusmenu-565603d992afa03da6a8f485fcdbe8b71677f7db.tar.gz libdbusmenu-565603d992afa03da6a8f485fcdbe8b71677f7db.tar.bz2 libdbusmenu-565603d992afa03da6a8f485fcdbe8b71677f7db.zip | |
releasing version 0.4.3-0ubuntu3
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9406cfb..b4feae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low + + * Backport bug fixes from trunk: + - Fix a typo in the signal name to make it match the XML + files (LP: #641209) + - Ref'ing the server for the entire time we're getting the + bus (LP: #738568) + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 19 Apr 2011 15:14:23 -0400 + libdbusmenu (0.4.3-0ubuntu2) natty; urgency=low * Backport bug fixes from trunk: diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 2e6b09a..588c940 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1239,7 +1239,7 @@ menuproxy_signal_cb (GDBusProxy * proxy, gchar * sender, gchar * signal, GVarian } else if (priv->root == NULL) { /* Drop out here, all the rest of these really need to have a root node so we can just ignore them if there isn't one. */ - } else if (g_strcmp0(signal, "ItemPropertiesUpdated") == 0) { + } else if (g_strcmp0(signal, "ItemsPropertiesUpdated") == 0) { /* Remove before adding just incase there is a duplicate, against the rules, but we can handle it so let's do it. */ GVariantIter ritems; diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index a41e6ce..be99421 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -455,6 +455,7 @@ set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec) g_return_if_fail(priv->bus_lookup != NULL); } + g_object_ref(obj); g_bus_get(G_BUS_TYPE_SESSION, priv->bus_lookup, bus_got_cb, obj); } else { register_object(DBUSMENU_SERVER(obj)); @@ -694,6 +695,7 @@ bus_got_cb (GObject * obj, GAsyncResult * result, gpointer user_data) if (error != NULL) { g_warning("Unable to get session bus: %s", error->message); g_error_free(error); + g_object_unref(G_OBJECT(user_data)); return; } @@ -706,6 +708,7 @@ bus_got_cb (GObject * obj, GAsyncResult * result, gpointer user_data) register_object(DBUSMENU_SERVER(user_data)); + g_object_unref(G_OBJECT(user_data)); return; } @@ -983,7 +986,7 @@ menuitem_property_idle (gpointer user_data) NULL, priv->dbusobject, DBUSMENU_INTERFACE, - "ItemPropertiesUpdated", + "ItemsPropertiesUpdated", g_variant_new_tuple(megadata, 2), NULL); } else { |