From f3100ad3c69bc6de5de35778ce5adda182aa28cb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 12 Sep 2011 03:14:53 +0000 Subject: [PATCH] don't require "menu/" prefix for menu icons, fall back on regular icon name SVN revision: 63335 --- legacy/elementary/src/lib/elm_menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index 8a9292855b..02d85bab4e 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -702,7 +702,8 @@ elm_menu_item_object_icon_name_set(Elm_Menu_Item *item, const char *icon) if (!*icon) return; if ((item->icon_str) && (!strcmp(item->icon_str, icon))) return; if ((snprintf(icon_tmp, sizeof(icon_tmp), "menu/%s", icon) > 0) && - (elm_icon_standard_set(item->content, icon_tmp))) + (elm_icon_standard_set(item->content, icon_tmp) || + elm_icon_standard_set(item->content, icon))) { eina_stringshare_replace(&item->icon_str, icon); edje_object_signal_emit(item->base.view, "elm,state,icon,visible", "elm");