Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
internal_icons should always point to an icon, not to an e_app
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -3 -r1.573 -r1.574
--- e_border.c 2 Mar 2007 17:00:20 -0000 1.573
+++ e_border.c 24 Mar 2007 15:18:00 -0000 1.574
@@ -2591,30 +2591,18 @@
e_util_edje_icon_set(o, "enlightenment/e");
else
{
- a = e_app_new(bd->internal_icon, 0);
- if (a)
+ char *ext;
+
+ ext = strrchr(bd->internal_icon, '.');
+ if ((ext) && ((!strcmp(ext, ".edj"))))
{
- /* 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));
+ if (!edje_object_file_set(o, bd->internal_icon, "icon"))
+ e_util_edje_icon_set(o, "enlightenment/e");
}
- else
+ else
{
- 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");
- }
+ if (!e_util_edje_icon_set(o, bd->internal_icon))
+ e_util_edje_icon_set(o, "enlightenment/e");
}
}
if (o)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
