diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2015-04-10 21:56:10 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-04-10 21:56:10 +0000 |
| commit | 7dd5e5cabcc894a09cddc839b908251ccbff77ad (patch) | |
| tree | 2ded2ffd29d1ad1976af81c62180f3a3b1147474 /libdbusmenu-gtk/parser.c | |
| parent | 79d7a4fbebebd31b8fd175e3dc5f281a101d5fb9 (diff) | |
| parent | ef2e52734cfe324724acd8c855ecb5504fb24e2e (diff) | |
| download | libdbusmenu-7dd5e5cabcc894a09cddc839b908251ccbff77ad.tar.gz libdbusmenu-7dd5e5cabcc894a09cddc839b908251ccbff77ad.tar.bz2 libdbusmenu-7dd5e5cabcc894a09cddc839b908251ccbff77ad.zip | |
Parser: don't override the label for stock items if a custom one is provided Fixes: #1270486
Approved by: Timo Jyrinki, PS Jenkins bot
Diffstat (limited to 'libdbusmenu-gtk/parser.c')
| -rw-r--r-- | libdbusmenu-gtk/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index cc83e18..d23fb75 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -886,7 +886,7 @@ update_icon (DbusmenuMenuitem *menuitem, ParserData * pdata, GtkImage *image) const gchar * label = NULL; label = dbusmenu_menuitem_property_get (menuitem, DBUSMENU_MENUITEM_PROP_LABEL); - if (stock.label != NULL && label != NULL) { + if (stock.label != NULL && label != NULL && label[0] == '\0') { dbusmenu_menuitem_property_set (menuitem, DBUSMENU_MENUITEM_PROP_LABEL, stock.label); |