Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_int_config_transitions.c
Log Message:
fix transitions segv due to preview widget being inserted
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- e_fm.c 22 Apr 2007 15:30:00 -0000 1.149
+++ e_fm.c 2 May 2007 11:21:18 -0000 1.150
@@ -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
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_transitions.c 2 May 2007 02:30:54 -0000 1.14
+++ e_int_config_transitions.c 2 May 2007 11:21:18 -0000 1.15
@@ -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 @@
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 @@
}
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 @@
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;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
