aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--libdbusmenu-gtk/client.c4
2 files changed, 9 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 336f048..fcf8066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
+libdbusmenu (0.2.7-0ubuntu2~ppa2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Crash fix in blank items
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 24 Mar 2010 12:34:09 -0500
+
libdbusmenu (0.2.7-0ubuntu2~ppa1) lucid; urgency=low
* Upstream Merge
- * Adding support for blank icons
+ * Adding support for blank icons (LP: #534854)
+ * Remove unneeded warning (LP: #537312)
-- Ted Gould <ted@ubuntu.com> Wed, 24 Mar 2010 11:20:33 -0500
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index e79d088..98f1cb2 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -525,10 +525,6 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GV
icon either. */
gtkimage = NULL;
} else if (g_strcmp0(iconname, DBUSMENU_MENUITEM_ICON_NAME_BLANK) == 0) {
- if (gtkimage != NULL) {
- g_object_unref(gtkimage);
- }
-
gtkimage = gtk_image_new();
} else {
/* Look to see if we want to have an icon with the 'ltr' or