diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menuitem.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 49b0bb6..842b26c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.4.0-0ubuntu2~ppa3) UNRELEASED; urgency=low + + * Upstream Merge + * Don't unref the variant we didn't have a ref to + when we error out. + + -- Ted Gould <ted@ubuntu.com> Mon, 28 Mar 2011 21:55:07 -0500 + libdbusmenu (0.4.0-0ubuntu2~ppa2) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c index ca2bc3e..f02e171 100644 --- a/libdbusmenu-gtk/menuitem.c +++ b/libdbusmenu-gtk/menuitem.c @@ -287,7 +287,6 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke if (g_variant_n_children(wrapper) != 1) { g_warning("Unable to parse shortcut, too many keys"); - g_variant_unref(wrapper); return; } |