rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify extension checking 

SVN revision: 76845
This commit is contained in:
Mike Blumenkrantz 2012-09-19 07:16:54 +00:00
parent 295798af41
commit 0baad3fe70
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_menu.c
View File

@ -692,7 +692,6 @@ e_menu_item_num_get(const E_Menu_Item *mi)
EAPI void EAPI void
e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon) e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
{ {
int len;
E_OBJECT_CHECK(mi); E_OBJECT_CHECK(mi);
E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE); E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) || if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) ||
@ -705,8 +704,7 @@ e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
if (icon) if (icon)
{ {
mi->icon = eina_stringshare_add(icon); mi->icon = eina_stringshare_add(icon);
len = strlen(icon); if (eina_str_has_extension(mi->icon, ".edj"))
if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj")))
mi->icon_key = eina_stringshare_add("icon"); mi->icon_key = eina_stringshare_add("icon");
} }
mi->changed = 1; mi->changed = 1;