aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2011-02-17 07:48:27 -0500
committerMichael Terry <mike@mterry.name>2011-02-17 07:48:27 -0500
commit2ee586c80b9cd334cc98559a9754c3492d01e8b3 (patch)
treeb59bedaa8e8c8fdf91302a1536e16e179bd0591d
parente342bd662608d2557bb79d6d6cea5947a58fb09f (diff)
downloadlibdbusmenu-2ee586c80b9cd334cc98559a9754c3492d01e8b3.tar.gz
libdbusmenu-2ee586c80b9cd334cc98559a9754c3492d01e8b3.tar.bz2
libdbusmenu-2ee586c80b9cd334cc98559a9754c3492d01e8b3.zip
make sure other icon property is removed when setting one
-rw-r--r--libdbusmenu-gtk/parser.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index 38528d8..8aa2837 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -586,8 +586,12 @@ update_icon (DbusmenuMenuitem *menuitem, GtkImage *image)
dbusmenu_menuitem_property_set (menuitem,
DBUSMENU_MENUITEM_PROP_ICON_NAME,
icon_name);
+ dbusmenu_menuitem_property_remove (menuitem,
+ DBUSMENU_MENUITEM_PROP_ICON_DATA);
}
else if (pixbuf != NULL) {
+ dbusmenu_menuitem_property_remove (menuitem,
+ DBUSMENU_MENUITEM_PROP_ICON_NAME);
dbusmenu_menuitem_property_set_image (menuitem,
DBUSMENU_MENUITEM_PROP_ICON_DATA,
pixbuf);