aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/genericmenuitem.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-10-13 11:23:25 -0500
committerTed Gould <ted@gould.cx>2011-10-13 11:23:25 -0500
commit662b22342e62004fae0fb20ac26a315122798ffa (patch)
treee9fac1fd45627e64ed323c45b266e13b44a288bf /libdbusmenu-gtk/genericmenuitem.c
parent788e779f219aa64a281de3e3903072d151e3baa8 (diff)
parentf966667e6e1af74f06c65d8cfca78d0b861d5621 (diff)
downloadlibdbusmenu-662b22342e62004fae0fb20ac26a315122798ffa.tar.gz
libdbusmenu-662b22342e62004fae0fb20ac26a315122798ffa.tar.bz2
libdbusmenu-662b22342e62004fae0fb20ac26a315122798ffa.zip
* New upstream release.
* Allow for an ID of 0 in about_to_show for indicators (LP: #862989) * Clear the image pointer when we take it * Ensure we drop all references to the GTK widget when a menuitem gets destroyed (LP: #835646)
Diffstat (limited to 'libdbusmenu-gtk/genericmenuitem.c')
-rw-r--r--libdbusmenu-gtk/genericmenuitem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 5488f93..ef77a2e 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -449,6 +449,7 @@ genericmenuitem_set_image (Genericmenuitem * menu_item, GtkWidget * image)
if (GTK_IS_IMAGE(child)) {
/* We've got a label, let's update it. */
imagew = GTK_IMAGE(child);
+ child = NULL;
} else if (GTK_IS_BOX(child)) {
/* Look for the label in the box */
gtk_container_foreach(GTK_CONTAINER(child), set_image_helper, &imagew);