diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index aa44035..7152fde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.3-0ubuntu2) lucid; urgency=low + + * Upstream Merge + * Removing the ref to root and a setting of root + + -- Ted Gould <ted@ubuntu.com> Tue, 09 Feb 2010 08:53:00 -0600 + libdbusmenu (0.2.3-0ubuntu1) lucid; urgency=low * Upstream release 0.2.3 diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 2302110..5d7b5b1 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -774,15 +774,14 @@ parse_layout (DbusmenuClient * client, const gchar * layout) g_debug("Client signaling root changed."); #endif - /* Switch the root around */ - g_object_ref(priv->root); - dbusmenu_menuitem_set_root(priv->root, TRUE); - + /* If they are different, and there was an old root we must + clean up that old root */ if (oldroot != NULL) { dbusmenu_menuitem_set_root(oldroot, FALSE); g_object_unref(oldroot); } + /* If the root changed we can signal that */ g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } |