On 9/19/07, Gustavo Sverzut Barbieri <[EMAIL PROTECTED]> wrote:
> Looks fine and implements exactly the initial idea that we've
> discussed with Moom.
Attached are fixes for apps/exhibit and apps/emphasis to *not* use
etk_signal_stop() (and use return values instead).
Cheers,
Caio Marcelo
Index: apps/emphasis/src/bin/emphasis_callbacks.c
===================================================================
RCS file: /var/cvs/e/e17/apps/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.27
diff -u -r1.27 emphasis_callbacks.c
--- apps/emphasis/src/bin/emphasis_callbacks.c 4 Jun 2007 12:33:01 -0000 1.27
+++ apps/emphasis/src/bin/emphasis_callbacks.c 19 Sep 2007 18:02:09 -0000
@@ -1157,7 +1157,6 @@
configgui = data;
etk_widget_hide_all(configgui->window);
- etk_signal_stop();
return ETK_TRUE;
}
Index: apps/exhibit/src/bin/exhibit_image.c
===================================================================
RCS file: /var/cvs/e/e17/apps/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.56
diff -u -r1.56 exhibit_image.c
--- apps/exhibit/src/bin/exhibit_image.c 5 Sep 2007 10:56:11 -0000 1.56
+++ apps/exhibit/src/bin/exhibit_image.c 19 Sep 2007 18:02:11 -0000
@@ -21,7 +21,7 @@
static void _ex_image_delete_dialog_response(Etk_Object *obj, int response_id, void *data);
static void _ex_image_delete_cb(void *data);
-void
+Etk_Bool
_ex_image_mouse_wheel(Etk_Object *object, void *event, void *data)
{
Exhibit *e;
@@ -59,7 +59,7 @@
}
}
- etk_signal_stop();
+ return ETK_TRUE;
}
void
Index: apps/exhibit/src/bin/exhibit_image.h
===================================================================
RCS file: /var/cvs/e/e17/apps/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.14
diff -u -r1.14 exhibit_image.h
--- apps/exhibit/src/bin/exhibit_image.h 6 Jul 2007 20:29:50 -0000 1.14
+++ apps/exhibit/src/bin/exhibit_image.h 19 Sep 2007 18:02:11 -0000
@@ -4,7 +4,7 @@
#ifndef _EX_IMAGE_H
#define _EX_IMAGE_H
-void _ex_image_mouse_wheel(Etk_Object *object, void *event, void *data);
+Etk_Bool _ex_image_mouse_wheel(Etk_Object *object, void *event, void *data);
void _ex_image_mouse_down(Etk_Object *object, void *event, void *data);
void _ex_image_mouse_up(Etk_Object *object, void *event, void *data);
void _ex_image_mouse_move(Etk_Object *object, void *event, void *data);
Index: apps/exhibit/src/bin/exhibit_main.c
===================================================================
RCS file: /var/cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.123
diff -u -r1.123 exhibit_main.c
--- apps/exhibit/src/bin/exhibit_main.c 19 Sep 2007 12:09:50 -0000 1.123
+++ apps/exhibit/src/bin/exhibit_main.c 19 Sep 2007 18:02:12 -0000
@@ -31,7 +31,7 @@
static void _ex_main_monitor_dir(void *data, Ecore_File_Monitor *ecore_file_monitor, Ecore_File_Event event, const char *path);
static int _ex_main_dtree_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1, Etk_Tree_Row *row2, void *data);
static void _ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data);
-static void _ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event, void *data);
+static Etk_Bool _ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event, void *data);
static void _ex_main_combobox_entry_changed_cb(Etk_Object *object, void *data);
static Etk_Bool _ex_main_window_deleted_cb(void *data);
static void _ex_main_window_key_down_cb(Etk_Object *object, void *event, void *data);
@@ -547,10 +547,11 @@
}
}
-static void
+static Etk_Bool
_ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event, void *data)
{
Etk_Event_Key_Down *ev = event;
+ Etk_Bool stop_signal = ETK_FALSE;
if (!strcmp(ev->key, "Tab"))
{
@@ -560,7 +561,7 @@
Evas_List *l;
/* Stop the propagation of the signal so the focus won't be passed to the next widget */
- etk_signal_stop();
+ stop_signal = ETK_TRUE;
path = etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry))));
dir = ecore_file_dir_get((char*)path);
@@ -570,7 +571,7 @@
dir = strdup("/");
if(!file || !strcmp(file, path))
- return;
+ return stop_signal;
D(("dir='%s' file='%s'\n", dir, file));
@@ -586,7 +587,7 @@
}
if ((dirfd = opendir(dir)) == NULL)
- return;
+ return stop_signal;
while ((dir_entry = readdir(dirfd)) != NULL)
{
@@ -632,6 +633,8 @@
etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
+
+ return stop_signal;
}
static void _ex_main_combobox_entry_changed_cb(Etk_Object *object, void *data)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
