From: discomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Mon, 12 Sep 2011 03:14:53 +0000 (+0000)
Subject: don't require "menu/" prefix for menu icons, fall back on regular icon name
X-Git-Tag: REBUILDD-ARMEL-68287~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=967bcbb0d1df377ec3a84ddde4ea1d103c836ff9;p=framework%2Fuifw%2Felementary.git

don't require "menu/" prefix for menu icons, fall back on regular icon name

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63335 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index ee6719f..d0e6c1a 100644
--- a/src/lib/elm_menu.c
+++ b/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(VIEW(item), "elm,state,icon,visible", "elm");