Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
Fix up seggie while creating a new app.
Thanks to jcwong for pointing that out.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- e_eap_editor.c 4 Oct 2006 02:16:08 -0000 1.66
+++ e_eap_editor.c 4 Oct 2006 03:34:06 -0000 1.67
@@ -156,9 +156,9 @@
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 @@
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 @@
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
@@ -569,6 +566,12 @@
{
evas_object_del(cfdata->editor->img);
cfdata->editor->img = NULL;
+ }
+
+ IFFREE(cfdata->icon_path);
+ if (!cfdata->icon_theme)
+ {
+ IFDUP(cfdata->image, cfdata->icon_path);
}
IFDEL(cfdata->eap.icon_class);
-------------------------------------------------------------------------
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
