Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_combo.c ewl_filepicker.c
Log Message:
- fix segv.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_combo.c 20 Apr 2006 14:24:15 -0000 1.23
+++ ewl_combo.c 20 Apr 2006 19:57:06 -0000 1.24
@@ -99,7 +99,6 @@
/* we don't bail out early as the user could have prepended widgets
* to their data, so the selected_idx will be the same but the
* widget is actually different */
-
combo->selected_idx = idx;
/* remove the previously selected value */
@@ -118,9 +117,9 @@
combo->view->assign(combo->selected,
combo->model->fetch(combo->data, idx, 0));
}
- else if ((idx < 0) && combo->view && combo->view->header_fetch)
+ else if (combo->view && combo->view->header_fetch)
combo->selected = combo->view->header_fetch(combo->data,
- combo->selected_idx);
+ combo->selected_idx);
if (combo->selected)
{
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filepicker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_filepicker.c 20 Apr 2006 02:58:01 -0000 1.8
+++ ewl_filepicker.c 20 Apr 2006 19:57:06 -0000 1.9
@@ -144,11 +144,11 @@
ewl_combo_model_set(EWL_COMBO(fp->type_combo), model);
ewl_combo_view_set(EWL_COMBO(fp->type_combo), view);
ewl_combo_data_set(EWL_COMBO(fp->type_combo), fp);
+ ewl_combo_selected_set(EWL_COMBO(fp->type_combo), 0);
ewl_combo_editable_set(EWL_COMBO(fp->type_combo), TRUE);
ewl_callback_append(fp->type_combo, EWL_CALLBACK_VALUE_CHANGED,
ewl_filepicker_cb_type_change, fp);
ewl_container_child_append(EWL_CONTAINER(box), fp->type_combo);
- ewl_combo_selected_set(EWL_COMBO(fp->type_combo), 0);
ewl_widget_show(fp->type_combo);
box = ewl_vbox_new();
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
