Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_border.c
Log Message:
Take care of border internal app icons too.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- e_apps.c 2 Sep 2006 11:58:53 -0000 1.164
+++ e_apps.c 2 Sep 2006 13:29:59 -0000 1.165
@@ -1554,6 +1554,7 @@
else
e_icon_file_set(o, a->icon_path);
e_icon_fill_inside_set(o, 1);
+
return o;
}
@@ -1561,7 +1562,7 @@
EAPI Evas_Object *
e_app_icon_add(Evas *evas, E_App *a)
{
- Evas_Object *o;
+ Evas_Object *o = NULL;
if (a->icon_path)
o = _e_app_icon_path_add(evas, a);
@@ -1608,6 +1609,8 @@
EAPI void
e_app_icon_add_to_menu_item(E_Menu_Item *mi, E_App *a)
{
+ if (a->icon_path)
+ e_menu_item_icon_file_set(mi, a->icon_path);
if ((!a->icon_path) && (a->icon_class))
{
char *v;
@@ -1622,8 +1625,6 @@
/* e_menu_item_icon_edje_set() just tucks away the params, the actual call
to edje_object_file_set() happens later. */
/* e_menu_item_icon_file_set() just tucks away the params, the actual call
to e_icon_add() happens later. */
e_menu_item_icon_edje_set(mi, a->path, "icon");
- if (a->icon_path)
- e_menu_item_icon_file_set(mi, a->icon_path);
return;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -3 -r1.536 -r1.537
--- e_border.c 1 Sep 2006 15:37:23 -0000 1.536
+++ e_border.c 2 Sep 2006 13:29:59 -0000 1.537
@@ -2544,17 +2544,28 @@
e_util_edje_icon_set(o, "enlightenment/e");
else
{
- /* FIXME: .eaps are going away, raster says this is for module
.eaps, so need to take care of all that at the same time. */
- if (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4,
".eap"))
- {
- 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");
- }
+ 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(evas, a);
+ bd->app = a;
+ e_object_ref(E_OBJECT(bd->app));
+ }
+ else
+ {
+ if (!strcmp(bd->internal_icon + strlen(bd->internal_icon) -
4, ".eap"))
+ {
+ 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");
+ }
+ }
}
return o;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
