From 52d8db3b4699b2a2518ac7f018b19e0d8bc171fd Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Wed, 4 Oct 2006 02:16:08 +0000 Subject: [PATCH] Patch it up to work with the new icon regime. SVN revision: 26340 --- src/bin/e_eap_editor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index 395dcc821..e7ff511c0 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -142,6 +142,7 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd) 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 @@ _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 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 @@ _e_eap_editor_icon_show(E_Config_Dialog_Data *cfdata) 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)); }