Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_eap_editor.c e_int_border_menu.c
Log Message:
More icon work.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -3 -r1.534 -r1.535
--- e_border.c 30 Aug 2006 13:37:35 -0000 1.534
+++ e_border.c 1 Sep 2006 10:43:20 -0000 1.535
@@ -2536,6 +2536,7 @@
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"))
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_eap_editor.c 31 Aug 2006 14:51:44 -0000 1.45
+++ e_eap_editor.c 1 Sep 2006 10:43:20 -0000 1.46
@@ -32,6 +32,7 @@
char *wtitle;
char *wrole;
char *iclass;
+ char *ipath;
int icon_theme;
int startup_notify;
int wait_exit;
@@ -113,6 +114,7 @@
IFDUP(cfdata->editor->eap->win_title, cfdata->wtitle);
IFDUP(cfdata->editor->eap->win_role, cfdata->wrole);
IFDUP(cfdata->editor->eap->icon_class, cfdata->iclass);
+ IFDUP(cfdata->editor->eap->icon_path, cfdata->ipath);
cfdata->startup_notify = cfdata->editor->eap->startup_notify;
cfdata->wait_exit = cfdata->editor->eap->wait_exit;
/*- COMMON -*/
@@ -147,6 +149,7 @@
E_FREE(data->wtitle);
E_FREE(data->wrole);
E_FREE(data->iclass);
+ E_FREE(data->ipath);
E_FREE(data->image);
if (data->editor->eap->tmpfile) ecore_file_unlink(data->editor->eap->image);
data->editor->eap->tmpfile = 0;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_int_border_menu.c 23 Aug 2006 03:39:02 -0000 1.40
+++ e_int_border_menu.c 1 Sep 2006 10:43:20 -0000 1.41
@@ -278,7 +278,7 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Edit Icon"));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
- e_menu_item_icon_edje_set(mi, bd->app->path, "icon");
+ e_app_icon_add_to_menu_item(mi, bd->app);
}
else if (bd->client.icccm.class) /* icons with no class useless to
borders */
{
-------------------------------------------------------------------------
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
