From e192dea795e83229b9245451be891bc5857ca607 Mon Sep 17 00:00:00 2001 From: Sense Hofstede Date: Fri, 12 Feb 2010 21:59:38 +0100 Subject: * When a GtkImageMenuItem has got a stock icon set don't just assume it's also using the stock label, but check first. (Closes: #520048) --- src/libappindicator/app-indicator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index d179df7..d3a50bc 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -1076,7 +1076,10 @@ update_stock_item (DbusmenuMenuitem *menuitem, DBUSMENU_MENUITEM_PROP_ICON_NAME, image->data.stock.stock_id); - if (stock.label != NULL) + const gchar * label = dbusmenu_menuitem_property_get (menuitem, + DBUSMENU_MENUITEM_PROP_LABEL) + + if (stock.label != NULL && label != NULL) { dbusmenu_menuitem_property_set (menuitem, DBUSMENU_MENUITEM_PROP_LABEL, -- cgit v1.2.3