Enlightenment CVS committal Author : cmarcelo Project : e17 Module : libs/etk
Dir : e17/libs/etk/src/lib Modified Files: etk_button.c etk_colorpicker.c etk_combobox.c etk_combobox_entry.c etk_container.c etk_dialog.c etk_entry.c etk_iconbox.c etk_mdi_window.c etk_menu.c etk_menu_item.c etk_menu_shell.c etk_notebook.c etk_object.c etk_popup_window.c etk_range.c etk_signal.c etk_signal.h etk_text_view.c etk_toggle_button.c etk_tree.c etk_utils.c etk_utils.h etk_widget.c etk_window.c Log Message: Remove accumulator from signals. =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_button.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- etk_button.c 28 Sep 2007 20:01:26 -0000 1.48 +++ etk_button.c 28 Sep 2007 20:05:17 -0000 1.49 @@ -72,14 +72,11 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_HANDLER(ETK_BUTTON_PRESSED_SIGNAL, - "pressed", Etk_Button, pressed_handler, - etk_marshaller_VOID, NULL, NULL), + "pressed", Etk_Button, pressed_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_BUTTON_RELEASED_SIGNAL, - "released", Etk_Button, released_handler, - etk_marshaller_VOID, NULL, NULL), + "released", Etk_Button, released_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_BUTTON_CLICKED_SIGNAL, - "clicked", Etk_Button, clicked_handler, - etk_marshaller_VOID, NULL, NULL), + "clicked", Etk_Button, clicked_handler, etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_colorpicker.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- etk_colorpicker.c 28 Sep 2007 19:56:13 -0000 1.38 +++ etk_colorpicker.c 28 Sep 2007 20:05:17 -0000 1.39 @@ -113,7 +113,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_CP_COLOR_CHANGED_SIGNAL, - "color-changed", etk_marshaller_VOID, NULL, NULL), + "color-changed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- etk_combobox.c 28 Sep 2007 20:01:26 -0000 1.56 +++ etk_combobox.c 28 Sep 2007 20:05:17 -0000 1.57 @@ -89,9 +89,9 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_COMBOBOX_ITEM_ACTIVATED_SIGNAL, - "item-activated", etk_marshaller_OBJECT, NULL, NULL), + "item-activated", etk_marshaller_OBJECT), ETK_SIGNAL_DESC_NO_HANDLER(ETK_COMBOBOX_ACTIVE_ITEM_CHANGED_SIGNAL, - "active-item-changed", etk_marshaller_VOID, NULL, NULL), + "active-item-changed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_combobox_entry.c 28 Sep 2007 20:01:26 -0000 1.8 +++ etk_combobox_entry.c 28 Sep 2007 20:05:17 -0000 1.9 @@ -86,7 +86,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_COMBOBOX_ENTRY_ACTIVE_ITEM_CHANGED_SIGNAL, - "active-item-changed", etk_marshaller_VOID, NULL, NULL), + "active-item-changed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_container.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- etk_container.c 28 Sep 2007 19:56:13 -0000 1.24 +++ etk_container.c 28 Sep 2007 20:05:17 -0000 1.25 @@ -50,9 +50,9 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_CONTAINER_CHILD_ADDED_SIGNAL, - "child-added", etk_marshaller_OBJECT, NULL, NULL), + "child-added", etk_marshaller_OBJECT), ETK_SIGNAL_DESC_NO_HANDLER(ETK_CONTAINER_CHILD_REMOVED_SIGNAL, - "child-removed", etk_marshaller_OBJECT, NULL, NULL), + "child-removed", etk_marshaller_OBJECT), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_dialog.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- etk_dialog.c 28 Sep 2007 19:56:13 -0000 1.26 +++ etk_dialog.c 28 Sep 2007 20:05:17 -0000 1.27 @@ -54,7 +54,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_DIALOG_RESPONSE_SIGNAL, - "response", etk_marshaller_INT, NULL, NULL), + "response", etk_marshaller_INT), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_entry.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- etk_entry.c 28 Sep 2007 20:01:26 -0000 1.40 +++ etk_entry.c 28 Sep 2007 20:05:17 -0000 1.41 @@ -82,7 +82,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_ENTRY_TEXT_CHANGED_SIGNAL, - "text-changed", etk_marshaller_VOID, NULL, NULL), + "text-changed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- etk_iconbox.c 28 Sep 2007 19:56:13 -0000 1.30 +++ etk_iconbox.c 28 Sep 2007 20:05:17 -0000 1.31 @@ -120,13 +120,13 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_ICONBOX_ICON_SELECTED_SIGNAL, - "icon-selected", etk_marshaller_POINTER, NULL, NULL), + "icon-selected", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_ICONBOX_ICON_UNSELECTED_SIGNAL, - "icon-unselected", etk_marshaller_POINTER, NULL, NULL), + "icon-unselected", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_ICONBOX_ALL_SELECTED_SIGNAL, - "all-selected", etk_marshaller_VOID, NULL, NULL), + "all-selected", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_ICONBOX_ALL_UNSELECTED_SIGNAL, - "all-unselected", etk_marshaller_VOID, NULL, NULL), + "all-unselected", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_mdi_window.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_mdi_window.c 28 Sep 2007 20:01:26 -0000 1.8 +++ etk_mdi_window.c 28 Sep 2007 20:05:17 -0000 1.9 @@ -68,10 +68,10 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_MDI_WINDOW_MOVED_SIGNAL, - "moved", etk_marshaller_INT_INT, NULL, NULL), + "moved", etk_marshaller_INT_INT), ETK_SIGNAL_DESC_HANDLER(ETK_MDI_WINDOW_DELETE_EVENT_SIGNAL, "delete-event", Etk_Mdi_Window, delete_event, - etk_marshaller_VOID, etk_accumulator_bool_or, NULL), + etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_menu.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- etk_menu.c 28 Sep 2007 19:56:13 -0000 1.32 +++ etk_menu.c 28 Sep 2007 20:05:17 -0000 1.33 @@ -64,9 +64,9 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_MENU_POPPED_UP_SIGNAL, - "popped-up", etk_marshaller_VOID, NULL, NULL), + "popped-up", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_MENU_POPPED_DOWN_SIGNAL, - "popped-down", etk_marshaller_VOID, NULL, NULL), + "popped-down", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_menu_item.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- etk_menu_item.c 28 Sep 2007 19:56:13 -0000 1.33 +++ etk_menu_item.c 28 Sep 2007 20:05:17 -0000 1.34 @@ -82,13 +82,13 @@ const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_HANDLER(ETK_MENU_ITEM_SELECTED_SIGNAL, "selected", Etk_Menu_Item, selected_handler, - etk_marshaller_VOID, NULL, NULL), + etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_MENU_ITEM_UNSELECTED_SIGNAL, "unselected", Etk_Menu_Item, unselected_handler, - etk_marshaller_VOID, NULL, NULL), + etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_MENU_ITEM_ACTIVATED_SIGNAL, "activated", Etk_Menu_Item, activated_handler, - etk_marshaller_VOID, NULL, NULL), + etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; @@ -436,7 +436,7 @@ const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_HANDLER(ETK_MENU_ITEM_CHECK_TOGGLED_SIGNAL, "toggled", Etk_Menu_Item_Check, toggled_handler, - etk_marshaller_VOID, NULL, NULL), + etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_menu_shell.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- etk_menu_shell.c 28 Sep 2007 19:56:13 -0000 1.14 +++ etk_menu_shell.c 28 Sep 2007 20:05:17 -0000 1.15 @@ -43,9 +43,9 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_MENU_SHELL_ITEM_ADDED_SIGNAL, - "item-added", etk_marshaller_OBJECT, NULL, NULL), + "item-added", etk_marshaller_OBJECT), ETK_SIGNAL_DESC_NO_HANDLER(ETK_MENU_SHELL_ITEM_REMOVED_SIGNAL, - "item-removed", etk_marshaller_OBJECT, NULL, NULL), + "item-removed", etk_marshaller_OBJECT), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_notebook.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- etk_notebook.c 28 Sep 2007 20:01:26 -0000 1.44 +++ etk_notebook.c 28 Sep 2007 20:05:17 -0000 1.45 @@ -70,7 +70,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_NOTEBOOK_PAGE_CHANGED_SIGNAL, - "current-page-changed", etk_marshaller_VOID, NULL, NULL), + "current-page-changed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_object.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- etk_object.c 28 Sep 2007 19:56:13 -0000 1.40 +++ etk_object.c 28 Sep 2007 20:05:17 -0000 1.41 @@ -92,7 +92,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_OBJECT_DESTROYED_SIGNAL, - "destroyed", etk_marshaller_VOID, NULL, NULL), + "destroyed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_popup_window.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- etk_popup_window.c 28 Sep 2007 19:56:13 -0000 1.24 +++ etk_popup_window.c 28 Sep 2007 20:05:17 -0000 1.25 @@ -68,9 +68,9 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_POPUP_WINDOW_POPPED_UP_SIGNAL, - "popped-up", etk_marshaller_VOID, NULL, NULL), + "popped-up", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_POPUP_WINDOW_POPPED_DOWN_SIGNAL, - "popped-down", etk_marshaller_VOID, NULL, NULL), + "popped-down", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_range.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- etk_range.c 28 Sep 2007 19:56:13 -0000 1.23 +++ etk_range.c 28 Sep 2007 20:05:17 -0000 1.24 @@ -53,7 +53,7 @@ const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_HANDLER(ETK_RANGE_VALUE_CHANGED_SIGNAL, "value-changed", Etk_Range, value_changed_handler, - etk_marshaller_DOUBLE, NULL, NULL), + etk_marshaller_DOUBLE), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_signal.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- etk_signal.c 28 Sep 2007 20:01:27 -0000 1.33 +++ etk_signal.c 28 Sep 2007 20:05:17 -0000 1.34 @@ -47,8 +47,7 @@ * @brief Creates a new signal in the system. */ static Etk_Signal *etk_signal_new_raw(const char *signal_name, Etk_Type *type, - long handler_offset, Etk_Marshaller marshaller, Etk_Accumulator accumulator, - void *accum_data) + long handler_offset, Etk_Marshaller marshaller) { Etk_Signal *new_signal; @@ -57,8 +56,6 @@ new_signal->code = type->signals_count; new_signal->handler_offset = handler_offset; new_signal->marshaller = marshaller; - new_signal->accumulator = accumulator; - new_signal->accum_data = accum_data; etk_type_signal_add(type, new_signal); type->signals_count++; @@ -79,16 +76,11 @@ * handler. * @param marshaller the marshaller of the signal: it will treat and pass the * arguments to the callbacks. - * @param accumulator the accumulator used to combine together the different - * values returned by the callbacks. Set it to NULL if the callbacks does not - * return any value or if you only want to keep the last returned value. - * @param accum_data the value to pass to the accumulator * * @return Returns the new signal code, or -1 in case of failure */ int etk_signal_new(const char *signal_name, Etk_Type *type, long handler_offset, - Etk_Marshaller marshaller, Etk_Accumulator accumulator, - void *accum_data) + Etk_Marshaller marshaller) { Etk_Signal *new_signal; @@ -96,7 +88,7 @@ return -1; new_signal = etk_signal_new_raw(signal_name, type, handler_offset, - marshaller, accumulator, accum_data); + marshaller); if (!new_signal) return -1; @@ -130,8 +122,7 @@ } new_signal = etk_signal_new_raw(desc->name, type, desc->handler_offset, - desc->marshaller, desc->accumulator, - desc->accum_data); + desc->marshaller); if (!new_signal) { =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_signal.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_signal.h 28 Sep 2007 20:01:27 -0000 1.19 +++ etk_signal.h 28 Sep 2007 20:05:17 -0000 1.20 @@ -40,19 +40,17 @@ char *name; long handler_offset; Etk_Marshaller marshaller; - Etk_Accumulator accumulator; - void *accum_data; } Etk_Signal_Description; -#define ETK_SIGNAL_DESCRIPTION_SENTINEL {NULL, NULL, 0, NULL, NULL, NULL} +#define ETK_SIGNAL_DESCRIPTION_SENTINEL {NULL, NULL, 0, NULL} -#define ETK_SIGNAL_DESC_NO_HANDLER(signal_code, name, marshaller, accumulator, accum_data) \ +#define ETK_SIGNAL_DESC_NO_HANDLER(signal_code, name, marshaller) \ {&(signal_code), (name), -1, \ - (marshaller), (accumulator), (accum_data)} + (marshaller)} -#define ETK_SIGNAL_DESC_HANDLER(signal_code, name, type, handler, marshaller, accumulator, accum_data) \ +#define ETK_SIGNAL_DESC_HANDLER(signal_code, name, type, handler, marshaller) \ {&(signal_code), (name), ETK_MEMBER_OFFSET(type, handler), \ - (marshaller), (accumulator), (accum_data)} + (marshaller)} /** * @brief The structure of a signal @@ -65,15 +63,12 @@ int code; long handler_offset; Etk_Marshaller marshaller; - Etk_Accumulator accumulator; - void *accum_data; }; void etk_signal_shutdown(void); int etk_signal_new(const char *signal_name, Etk_Type *type, - long handler_offset, Etk_Marshaller marshaller, - Etk_Accumulator accumulator, void *accum_data); + long handler_offset, Etk_Marshaller marshaller); void etk_signal_new_with_desc(Etk_Type *type, const Etk_Signal_Description *desc); void etk_signal_delete(Etk_Signal *signal); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_text_view.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- etk_text_view.c 28 Sep 2007 19:56:13 -0000 1.22 +++ etk_text_view.c 28 Sep 2007 20:05:17 -0000 1.23 @@ -54,7 +54,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_TEXT_VIEW_TEXT_CHANGED_SIGNAL, - "text-changed", etk_marshaller_VOID, NULL, NULL), + "text-changed", etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toggle_button.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- etk_toggle_button.c 28 Sep 2007 19:56:13 -0000 1.23 +++ etk_toggle_button.c 28 Sep 2007 20:05:17 -0000 1.24 @@ -49,8 +49,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_HANDLER(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL, - "toggled", Etk_Toggle_Button, toggled_handler, - etk_marshaller_VOID, NULL, NULL), + "toggled", Etk_Toggle_Button, toggled_handler, etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_tree.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -3 -r1.112 -r1.113 --- etk_tree.c 28 Sep 2007 20:01:27 -0000 1.112 +++ etk_tree.c 28 Sep 2007 20:05:17 -0000 1.113 @@ -173,27 +173,27 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ALL_SELECTED_SIGNAL, - "all-selected", etk_marshaller_VOID, NULL, NULL), + "all-selected", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ALL_UNSELECTED_SIGNAL, - "all-unselected", etk_marshaller_VOID, NULL, NULL), + "all-unselected", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_SELECTED_SIGNAL, - "row-selected", etk_marshaller_POINTER, NULL, NULL), + "row-selected", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_UNSELECTED_SIGNAL, - "row-unselected", etk_marshaller_POINTER, NULL, NULL), + "row-unselected", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_CLICKED_SIGNAL, - "row-clicked", etk_marshaller_POINTER_POINTER, NULL, NULL), + "row-clicked", etk_marshaller_POINTER_POINTER), /* TODO: do we really need "row-activated" */ ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_ACTIVATED_SIGNAL, - "row-activated", etk_marshaller_POINTER, NULL, NULL), + "row-activated", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_UNFOLDED_SIGNAL, - "row-unfolded", etk_marshaller_POINTER, NULL, NULL), + "row-unfolded", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_FOLDED_SIGNAL, - "row-folded", etk_marshaller_POINTER, NULL, NULL), + "row-folded", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_SHOWN_SIGNAL, - "row-shown", etk_marshaller_POINTER, NULL, NULL), + "row-shown", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_ROW_HIDDEN_SIGNAL, - "row-hidden", etk_marshaller_POINTER, NULL, NULL), + "row-hidden", etk_marshaller_POINTER), ETK_SIGNAL_DESCRIPTION_SENTINEL }; @@ -234,7 +234,7 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_TREE_COL_CELL_VALUE_CHANGED_SIGNAL, - "cell-value-changed", etk_marshaller_POINTER, NULL, NULL), + "cell-value-changed", etk_marshaller_POINTER), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_utils.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- etk_utils.c 28 Sep 2007 20:01:27 -0000 1.10 +++ etk_utils.c 28 Sep 2007 20:05:17 -0000 1.11 @@ -16,40 +16,6 @@ */ /** - * @brief Combines the returned boolean values together by performing an "OR" operation - * @param return_value the location where to store the result - * @param value_to_accum the new value to combine - * @param data unused - */ -void etk_accumulator_bool_or(void *return_value, const void *value_to_accum, void *data) -{ - Etk_Bool *return_bool; - const Etk_Bool *result_bool; - - if (!(return_bool = return_value) || !(result_bool = value_to_accum)) - return; - - *return_bool |= *result_bool; -} - -/** - * @brief Combines the returned boolean values together by performing an "AND" operation - * @param return_value the location where to store the result - * @param value_to_accum the new value to combine - * @param data unused - */ -void etk_accumulator_bool_and(void *return_value, const void *value_to_accum, void *data) -{ - Etk_Bool *return_bool; - const Etk_Bool *result_bool; - - if (!(return_bool = return_value) || !(result_bool = value_to_accum)) - return; - - *return_bool &= *result_bool; -} - -/** * @brief A utility function to use as a swapped callback. * It sets to NULL the pointer located at the adress stored in @a data. @n * For example, if you want to set "pointer" to NULL when "button" is clicked, you can do: @n =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_utils.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- etk_utils.h 28 Sep 2007 20:01:27 -0000 1.18 +++ etk_utils.h 28 Sep 2007 20:05:17 -0000 1.19 @@ -38,9 +38,6 @@ fprintf(stderr, "[Etk-Warning] (%s:%d - %s()):\n" format "\n\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__) -void etk_accumulator_bool_or(void *return_value, const void *value_to_accum, void *data); -void etk_accumulator_bool_and(void *return_value, const void *value_to_accum, void *data); - Etk_Bool etk_callback_set_null(void *data); unsigned int etk_current_time_get(); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_widget.c,v retrieving revision 1.126 retrieving revision 1.127 diff -u -3 -r1.126 -r1.127 --- etk_widget.c 28 Sep 2007 20:01:27 -0000 1.126 +++ etk_widget.c 28 Sep 2007 20:05:17 -0000 1.127 @@ -184,56 +184,49 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_SHOWN_SIGNAL, - "shown", Etk_Widget, shown_handler, - etk_marshaller_VOID, NULL, NULL), + "shown", Etk_Widget, shown_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_HIDDEN_SIGNAL, - "hidden", etk_marshaller_VOID, NULL, NULL), + "hidden", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_REALIZED_SIGNAL, - "realized", etk_marshaller_VOID, NULL, NULL), + "realized", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_UNREALIZED_SIGNAL, - "unrealized", etk_marshaller_VOID, NULL, NULL), + "unrealized", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_SIZE_REQUESTED_SIGNAL, - "size-requested", etk_marshaller_POINTER, NULL, NULL), + "size-requested", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_IN_SIGNAL, - "mouse-in", etk_marshaller_POINTER, NULL, NULL), + "mouse-in", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_OUT_SIGNAL, - "mouse-out", etk_marshaller_POINTER, NULL, NULL), + "mouse-out", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_MOVE_SIGNAL, - "mouse-move", etk_marshaller_POINTER, NULL, NULL), + "mouse-move", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_DOWN_SIGNAL, - "mouse-down", etk_marshaller_POINTER, NULL, NULL), + "mouse-down", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_UP_SIGNAL, - "mouse-up", etk_marshaller_POINTER, NULL, NULL), + "mouse-up", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_CLICK_SIGNAL, - "mouse-click", etk_marshaller_POINTER, NULL, NULL), + "mouse-click", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_MOUSE_WHEEL_SIGNAL, - "mouse-wheel", etk_marshaller_POINTER, NULL, NULL), + "mouse-wheel", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_KEY_DOWN_SIGNAL, - "key-down", etk_marshaller_POINTER, NULL, NULL), + "key-down", etk_marshaller_POINTER), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_KEY_UP_SIGNAL, - "key-up", etk_marshaller_POINTER, NULL, NULL), + "key-up", etk_marshaller_POINTER), ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_ENTERED_SIGNAL, - "entered", Etk_Widget, entered_handler, - etk_marshaller_VOID, NULL, NULL), + "entered", Etk_Widget, entered_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_LEFT_SIGNAL, - "left", Etk_Widget, left_handler, - etk_marshaller_VOID, NULL, NULL), + "left", Etk_Widget, left_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_FOCUSED_SIGNAL, - "focused", Etk_Widget, focused_handler, - etk_marshaller_VOID, NULL, NULL), + "focused", Etk_Widget, focused_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_UNFOCUSED_SIGNAL, - "unfocused", Etk_Widget, unfocused_handler, - etk_marshaller_VOID, NULL, NULL), + "unfocused", Etk_Widget, unfocused_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_ENABLED_SIGNAL, - "enabled", Etk_Widget, enabled_handler, - etk_marshaller_VOID, NULL, NULL), + "enabled", Etk_Widget, enabled_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_WIDGET_DISABLED_SIGNAL, - "disabled", Etk_Widget, disabled_handler, - etk_marshaller_VOID, NULL, NULL), + "disabled", Etk_Widget, disabled_handler, etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_SCROLL_SIZE_CHANGED_SIGNAL, - "scroll-size-changed", etk_marshaller_VOID, NULL, NULL), + "scroll-size-changed", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WIDGET_SELECTION_RECEIVED_SIGNAL, - "selection-received", etk_marshaller_POINTER, NULL, NULL), + "selection-received", etk_marshaller_POINTER), ETK_SIGNAL_DESCRIPTION_SENTINEL }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_window.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- etk_window.c 28 Sep 2007 20:01:27 -0000 1.55 +++ etk_window.c 28 Sep 2007 20:05:17 -0000 1.56 @@ -73,16 +73,15 @@ { const Etk_Signal_Description signals[] = { ETK_SIGNAL_DESC_NO_HANDLER(ETK_WINDOW_MOVED_SIGNAL, - "moved", etk_marshaller_VOID, NULL, NULL), + "moved", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WINDOW_RESIZED_SIGNAL, - "resized", etk_marshaller_VOID, NULL, NULL), + "resized", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WINDOW_FOCUSED_IN_SIGNAL, - "focused-in", etk_marshaller_VOID, NULL, NULL), + "focused-in", etk_marshaller_VOID), ETK_SIGNAL_DESC_NO_HANDLER(ETK_WINDOW_FOCUSED_OUT_SIGNAL, - "focused-out", etk_marshaller_VOID, NULL, NULL), + "focused-out", etk_marshaller_VOID), ETK_SIGNAL_DESC_HANDLER(ETK_WINDOW_DELETE_EVENT_SIGNAL, - "delete-event", Etk_Window, delete_event, - etk_marshaller_VOID, etk_accumulator_bool_or, NULL), + "delete-event", Etk_Window, delete_event, etk_marshaller_VOID), ETK_SIGNAL_DESCRIPTION_SENTINEL }; ------------------------------------------------------------------------- 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-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs