From cc0bc870a3ef65394ebf3d8014d4894ad74198d0 Mon Sep 17 00:00:00 2001
From: David Walter Seikel <onefang@gmail.com>
Date: Wed, 4 Oct 2006 03:34:06 +0000
Subject: [PATCH] Fix up seggie while creating a new app.

Thanks to jcwong for pointing that out.


SVN revision: 26341
---
 src/bin/e_eap_editor.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index e7ff511c0..db4e63c9d 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -156,9 +156,9 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd)
    if (!cfdata->icon_path)
      {
         IFDUP(cfdata->image, cfdata->icon_path);
-        if (!cfdata->icon_path)
-           cfdata->icon_theme = 1;
      }
+   if (!cfdata->icon_path)
+      cfdata->icon_theme = 1;
    /* Save it for later. */
    IFDUP(cfdata->icon_path, cfdata->image);
    return cfdata;
@@ -320,7 +320,8 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dial
    if (editor->img_widget) evas_object_del(editor->img_widget);
    editor->img_widget = e_widget_button_add(evas, "", NULL,
 					    _e_eap_editor_cb_icon_select, cfdata, editor);
-   e_widget_button_icon_set(editor->img_widget, editor->img);
+   if (editor->img)
+      e_widget_button_icon_set(editor->img_widget, editor->img);
    e_widget_min_size_set(editor->img_widget, 48, 48);
    e_widget_frametable_object_append(o, editor->img_widget,
 				     0, 0, 1, 1,
@@ -553,13 +554,9 @@ _cb_files_icon_theme_changed(void *data, Evas_Object *obj, void *event_info)
    E_Config_Dialog_Data *cfdata;
 
    cfdata = data;
-   IFFREE(cfdata->icon_path);
-   if (!cfdata->icon_theme)
-     {
-        IFDUP(cfdata->image, cfdata->icon_path);
-     }
    _e_eap_editor_icon_show(cfdata);
-   e_widget_button_icon_set(cfdata->editor->img_widget, cfdata->editor->img);
+   if (cfdata->editor->img)
+      e_widget_button_icon_set(cfdata->editor->img_widget, cfdata->editor->img);
 }
 
 static void
@@ -571,6 +568,12 @@ _e_eap_editor_icon_show(E_Config_Dialog_Data *cfdata)
 	cfdata->editor->img = NULL;
      }
 
+   IFFREE(cfdata->icon_path);
+   if (!cfdata->icon_theme)
+     {
+        IFDUP(cfdata->image, cfdata->icon_path);
+     }
+
    IFDEL(cfdata->eap.icon_class);
    IFDEL(cfdata->eap.icon_path);
    IFADD(cfdata->icon_class, cfdata->eap.icon_class);