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

Try to avoid returning a NULL icon. 

SVN revision: 26357
This commit is contained in:
David Walter Seikel 2006-10-05 13:34:43 +00:00
parent a80cbabfb7
commit 2b43816d36
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_border.c
View File

@ -2571,7 +2571,8 @@ e_border_icon_add(E_Border *bd, Evas *evas)
}
}
}
return o;
if (o)
return o;
}
if (e_config->use_app_icon)
{
@ -2582,7 +2583,6 @@ e_border_icon_add(E_Border *bd, Evas *evas)
bd->client.netwm.icons[0].width,
bd->client.netwm.icons[0].height);
e_icon_alpha_set(o, 1);
return o;
}
}
if (!o)
@ -2601,7 +2601,6 @@ e_border_icon_add(E_Border *bd, Evas *evas)
o = e_app_icon_add(evas, a);
bd->app = a;
e_object_ref(E_OBJECT(bd->app));
return o;
}
else if (bd->client.netwm.icons)
{
@ -2610,14 +2609,12 @@ e_border_icon_add(E_Border *bd, Evas *evas)
bd->client.netwm.icons[0].width,
bd->client.netwm.icons[0].height);
e_icon_alpha_set(o, 1);
return o;
}
}
if (!o)
{
o = edje_object_add(evas);
e_util_edje_icon_set(o, "enlightenment/unknown");
return o;
}
return o;
}