Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
Patch it up to work with the new icon regime.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_eap_editor.c 27 Sep 2006 16:20:44 -0000 1.65
+++ e_eap_editor.c 4 Oct 2006 02:16:08 -0000 1.66
@@ -142,6 +142,7 @@
IFADD(cfdata->editor->eap->icon, cfdata->eap.icon);
IFDUP(cfdata->editor->eap->icon_class, cfdata->icon_class);
IFDUP(cfdata->editor->eap->icon_path, cfdata->icon_path);
+ cfdata->eap.icon_type = cfdata->editor->eap->icon_type;
/*- ADVANCED -*/
IFDUP(cfdata->editor->eap->generic, cfdata->generic);
IFDUP(cfdata->editor->eap->comment, cfdata->comment);
@@ -265,6 +266,10 @@
IFDEL(eap->icon_theme);
}
}
+ if ((!cfdata->icon_theme) && (eap->icon_path))
+ eap->icon_type = E_APP_ICON_PATH;
+ else
+ eap->icon_type = E_APP_ICON_UNKNOWN;
/* FIXME: hardcoded until the eap editor provides fields to change it */
if (cfdata->eap.width) eap->width = cfdata->eap.width;
@@ -570,5 +575,9 @@
IFDEL(cfdata->eap.icon_path);
IFADD(cfdata->icon_class, cfdata->eap.icon_class);
IFADD(cfdata->icon_path, cfdata->eap.icon_path);
+ if ((!cfdata->icon_theme) && (cfdata->eap.icon_path))
+ cfdata->eap.icon_type = E_APP_ICON_PATH;
+ else
+ cfdata->eap.icon_type = E_APP_ICON_UNKNOWN;
cfdata->editor->img = e_app_icon_add(cfdata->editor->evas, &(cfdata->eap));
}
-------------------------------------------------------------------------
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
