enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

internal_icons should always point to an icon, not to an e_app 

SVN revision: 29012
This commit is contained in:
Sebastian Dransfeld 2007-03-24 15:18:00 +00:00
parent 1bffed5388
commit d98b09b6ff
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/bin/e_border.c
View File

@ -2591,30 +2591,18 @@ e_border_icon_add(E_Border *bd, Evas *evas)
e_util_edje_icon_set(o, "enlightenment/e");
else
{
a = e_app_new(bd->internal_icon, 0);
if (a)
{
/* Free the aborted object first. */
if (o) evas_object_del(o);
o = e_app_icon_add(a, evas);
bd->app = a;
e_object_ref(E_OBJECT(bd->app));
}
else
{
char *ext;
char *ext;
ext = strrchr(bd->internal_icon, '.');
if ((ext) && ((!strcmp(ext, ".edj"))))
{
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
e_util_edje_icon_set(o, "enlightenment/e");
}
else
{
if (!e_util_edje_icon_set(o, bd->internal_icon))
e_util_edje_icon_set(o, "enlightenment/e");
}
ext = strrchr(bd->internal_icon, '.');
if ((ext) && ((!strcmp(ext, ".edj"))))
{
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
e_util_edje_icon_set(o, "enlightenment/e");
}
else
{
if (!e_util_edje_icon_set(o, bd->internal_icon))
e_util_edje_icon_set(o, "enlightenment/e");
}
}
if (o)