diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-08 12:26:21 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-08 12:26:21 -0600 |
| commit | 78e906f06f2aaf6ca24f8ee5a0363367921f50dc (patch) | |
| tree | dcc52c699ea752b0deac67035782f18ddb64c26d | |
| parent | e8ac2fcb6cd946e90e873970976f6ae64354947c (diff) | |
| parent | 030d6a4f5a48fcac6333cc4159fc343141339a15 (diff) | |
| download | libdbusmenu-78e906f06f2aaf6ca24f8ee5a0363367921f50dc.tar.gz libdbusmenu-78e906f06f2aaf6ca24f8ee5a0363367921f50dc.tar.bz2 libdbusmenu-78e906f06f2aaf6ca24f8ee5a0363367921f50dc.zip | |
* Upstream Merge
* Making sure to unref the old item in all cases.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 6e8f49e..2126d83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) UNRELEASED; urgency=low + + * Upstream Merge + * Making sure to unref the old item in all cases. + + -- Ted Gould <ted@ubuntu.com> Mon, 08 Feb 2010 12:25:56 -0600 + libdbusmenu (0.2.3-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.2.3 diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 2302110..1c1574c 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -778,14 +778,14 @@ parse_layout (DbusmenuClient * client, const gchar * layout) g_object_ref(priv->root); dbusmenu_menuitem_set_root(priv->root, TRUE); - if (oldroot != NULL) { - dbusmenu_menuitem_set_root(oldroot, FALSE); - g_object_unref(oldroot); - } - g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } + if (oldroot != NULL) { + dbusmenu_menuitem_set_root(oldroot, FALSE); + g_object_unref(oldroot); + } + return 1; } |