diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-08 15:54:09 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-08 15:54:09 -0600 |
| commit | 7c730151725b6091b3ed3db75bbad7f765b16f09 (patch) | |
| tree | 6e68454177603d833013fc0e0b30cfd321cdd4f9 | |
| parent | 7cbb892373e78a26a7c50d535b97c444139b5942 (diff) | |
| parent | 2b26528b9d2feefd8ab014e7743a12521837be5f (diff) | |
| download | libdbusmenu-7c730151725b6091b3ed3db75bbad7f765b16f09.tar.gz libdbusmenu-7c730151725b6091b3ed3db75bbad7f765b16f09.tar.bz2 libdbusmenu-7c730151725b6091b3ed3db75bbad7f765b16f09.zip | |
* Upstream Merge
* Removing the ref to root and a setting of root
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 7f663eb..f456d97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) UNRELEASED; urgency=low + + * Upstream Merge + * Removing the ref to root and a setting of root + + -- Ted Gould <ted@ubuntu.com> Mon, 08 Feb 2010 15:53:42 -0600 + libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) lucid; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 7bc3eb5..64fc7d3 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -776,10 +776,6 @@ 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); - g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } |