From 06c1eb693b896f266f21920f0c61cdca6e46e77b Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 2 May 2007 11:21:18 +0000 Subject: [PATCH] fix transitions segv due to preview widget being inserted SVN revision: 29800 --- src/bin/e_fm.c | 2 -- src/bin/e_int_config_transitions.c | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 2337b5a93..3a5463e54 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -5,8 +5,6 @@ #define OVERCLIP 128 -/* FIXME: use edje messages & embryo for scrolling of bg's */ - /* FIXME: this is NOT complete. dnd not complete (started). only list view * works. in icon view it needs to be much better about placement of icons and * being able to save/load icon placement. it doesn't support backgrounds or diff --git a/src/bin/e_int_config_transitions.c b/src/bin/e_int_config_transitions.c index 78321799a..cd8b96d73 100644 --- a/src/bin/e_int_config_transitions.c +++ b/src/bin/e_int_config_transitions.c @@ -1,6 +1,6 @@ #include "e.h" -static Evas_Object *_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int minh); +static Evas_Object *_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int minh, Evas_Object **tp); static void _e_wid_done(void *data, Evas_Object *obj, const char *emission, const char *source); static void _trans_preview_trans_set(E_Config_Dialog_Data *cfdata, const char *trans); @@ -165,8 +165,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("Preview"), 0); - il = _trans_preview_add(cfdata, evas, 300, ((300 * zone->h) / zone->w)); - cfdata->tp = il; + il = _trans_preview_add(cfdata, evas, 300, ((300 * zone->h) / zone->w), &(cfdata->tp)); e_widget_framelist_object_append(of, il); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -257,7 +256,7 @@ _trans_cb_changed(void *data) } Evas_Object * -_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int minh) +_trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int minh, Evas_Object **tp) { Evas_Object *obj, *o, *oa; @@ -270,7 +269,8 @@ _trans_preview_add(E_Config_Dialog_Data *cfdata, Evas *evas, int minw, int minh) e_theme_edje_object_set(o, "base/theme/widgets", "e/transpreview/1"); evas_object_show(o); e_widget_preview_extern_object_set(obj, o); - + + *tp = obj; return oa; }