styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up seggie while creating a new app. 

Thanks to jcwong for pointing that out.


SVN revision: 26341
This commit is contained in:
David Walter Seikel 2006-10-04 03:34:06 +00:00
parent 52d8db3b46
commit cc0bc870a3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/e_eap_editor.c
View File

@ -156,9 +156,9 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd)
if (!cfdata->icon_path) if (!cfdata->icon_path)
{ {
IFDUP(cfdata->image, 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. */ /* Save it for later. */
IFDUP(cfdata->icon_path, cfdata->image); IFDUP(cfdata->icon_path, cfdata->image);
return cfdata; 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); if (editor->img_widget) evas_object_del(editor->img_widget);
editor->img_widget = e_widget_button_add(evas, "", NULL, editor->img_widget = e_widget_button_add(evas, "", NULL,
_e_eap_editor_cb_icon_select, cfdata, editor); _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_min_size_set(editor->img_widget, 48, 48);
e_widget_frametable_object_append(o, editor->img_widget, e_widget_frametable_object_append(o, editor->img_widget,
0, 0, 1, 1, 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; E_Config_Dialog_Data *cfdata;
cfdata = data; cfdata = data;
IFFREE(cfdata->icon_path);
if (!cfdata->icon_theme)
{
IFDUP(cfdata->image, cfdata->icon_path);
}
_e_eap_editor_icon_show(cfdata); _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 static void
@ -571,6 +568,12 @@ _e_eap_editor_icon_show(E_Config_Dialog_Data *cfdata)
cfdata->editor->img = NULL; 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_class);
IFDEL(cfdata->eap.icon_path); IFDEL(cfdata->eap.icon_path);
IFADD(cfdata->icon_class, cfdata->eap.icon_class); IFADD(cfdata->icon_class, cfdata->eap.icon_class);