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

e17: show fallback border icon again 

SVN revision: 62611
This commit is contained in:
Hannes Janetzek 2011-08-20 02:43:05 +00:00
parent a147da5358
commit b44ac37ec8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_border.c
View File

@ -3750,9 +3750,11 @@ e_border_icon_add(E_Border *bd,
o = NULL; o = NULL;
if (bd->internal) if (bd->internal)
{ {
o = edje_object_add(evas);
if (!bd->internal_icon) if (!bd->internal_icon)
e_util_edje_icon_set(o, "enlightenment"); {
o = e_icon_add(evas);
e_util_icon_theme_set(o, "enlightenment");
}
else else
{ {
if (!bd->internal_icon_key) if (!bd->internal_icon_key)
@ -3762,18 +3764,17 @@ e_border_icon_add(E_Border *bd,
ext = strrchr(bd->internal_icon, '.'); ext = strrchr(bd->internal_icon, '.');
if ((ext) && ((!strcmp(ext, ".edj")))) if ((ext) && ((!strcmp(ext, ".edj"))))
{ {
o = edje_object_add(evas);
if (!edje_object_file_set(o, bd->internal_icon, "icon")) if (!edje_object_file_set(o, bd->internal_icon, "icon"))
e_util_edje_icon_set(o, "enlightenment"); e_util_icon_theme_set(o, "enlightenment");
} }
else if (ext) else if (ext)
{ {
evas_object_del(o);
o = e_icon_add(evas); o = e_icon_add(evas);
e_icon_file_set(o, bd->internal_icon); e_icon_file_set(o, bd->internal_icon);
} }
else else
{ {
evas_object_del(o);
o = e_icon_add(evas); o = e_icon_add(evas);
if (!e_util_icon_theme_set(o, bd->internal_icon)) if (!e_util_icon_theme_set(o, bd->internal_icon))
e_util_icon_theme_set(o, "enlightenment"); e_util_icon_theme_set(o, "enlightenment");
@ -3781,6 +3782,7 @@ e_border_icon_add(E_Border *bd,
} }
else else
{ {
o = edje_object_add(evas);
edje_object_file_set(o, bd->internal_icon, edje_object_file_set(o, bd->internal_icon,
bd->internal_icon_key); bd->internal_icon_key);
} }