diff options
| author | Sense Hofstede <qense@ubuntu.com> | 2010-02-12 21:59:38 +0100 |
|---|---|---|
| committer | Sense Hofstede <qense@ubuntu.com> | 2010-02-12 21:59:38 +0100 |
| commit | e192dea795e83229b9245451be891bc5857ca607 (patch) | |
| tree | b03326e73971e35c143d1d443372fd46924f0cc2 | |
| parent | a98fd45c6f4e19d998e55c17a61c8860e6834049 (diff) | |
| download | ayatana-indicator-application-e192dea795e83229b9245451be891bc5857ca607.tar.gz ayatana-indicator-application-e192dea795e83229b9245451be891bc5857ca607.tar.bz2 ayatana-indicator-application-e192dea795e83229b9245451be891bc5857ca607.zip | |
* 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)
| -rw-r--r-- | src/libappindicator/app-indicator.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, |