diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2010-02-09 16:19:13 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2010-02-09 16:19:13 +0100 |
| commit | 6025c55281bb6ed4d6f47a9cb338db804f3822ad (patch) | |
| tree | 95878d967f8dd5fe9170dddcd0ef05db98a145cc | |
| parent | 67b12d9f2549670f528fd098c737d93761cd5d74 (diff) | |
| parent | ba028f8b4889fe56863065cbcbb8284c36517913 (diff) | |
| download | libdbusmenu-6025c55281bb6ed4d6f47a9cb338db804f3822ad.tar.gz libdbusmenu-6025c55281bb6ed4d6f47a9cb338db804f3822ad.tar.bz2 libdbusmenu-6025c55281bb6ed4d6f47a9cb338db804f3822ad.zip | |
releasing version 0.2.3-0ubuntu2
| -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); } |