diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-16 12:21:51 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-16 12:21:51 -0500 |
| commit | 5c9197af26598a528f69a814462cab40a349cbc2 (patch) | |
| tree | 7d03ffc19b7e7dda67505d929bba2a362284eb8c | |
| parent | b8e566754bb9aad78726eb46305589a286a86ec3 (diff) | |
| parent | e26f80a52f0453ee7efaca86487f5e04a17fd35b (diff) | |
| download | libdbusmenu-5c9197af26598a528f69a814462cab40a349cbc2.tar.gz libdbusmenu-5c9197af26598a528f69a814462cab40a349cbc2.tar.bz2 libdbusmenu-5c9197af26598a528f69a814462cab40a349cbc2.zip | |
* Upstream Merge
* Only unref root if the root has changed.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 9983db4..2baf8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.9-0ubuntu2~ppa2~refs7) UNRELEASED; urgency=low + + * Upstream Merge + * Only unref root if the root has changed. + + -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 12:21:30 -0500 + libdbusmenu (0.2.9-0ubuntu2~ppa2~refs6) lucid; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 3df5c6a..d2ba541 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -873,17 +873,14 @@ parse_layout (DbusmenuClient * client, const gchar * layout) clean up that old root */ if (oldroot != NULL) { dbusmenu_menuitem_set_root(oldroot, FALSE); + g_object_unref(oldroot); + oldroot = NULL; } /* If the root changed we can signal that */ g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } - /* We need to unref it in this function no matter */ - if (oldroot != NULL) { - g_object_unref(oldroot); - } - return 1; } |