Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_alignment.c etk_bin.c etk_button.c etk_colorpicker.c
etk_combobox.c etk_frame.c etk_image.c etk_label.c etk_menu.c
etk_menu_item.c etk_radio_button.c etk_range.c
etk_scrolled_view.c etk_signal.c etk_signal.h etk_string.c
etk_table.c etk_toggle_button.c etk_tree.c etk_widget.c
etk_window.c
Log Message:
Reverts recent changes on etk_object_notify() and etk_signal_emit()
since we do not need them anymore with the etk_object_destroy() queue
thing.
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_alignment.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_alignment.c 8 Aug 2006 18:03:01 -0000 1.7
+++ etk_alignment.c 13 Aug 2006 22:42:23 -0000 1.8
@@ -88,32 +88,28 @@
{
alignment->xalign = xalign;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), "xalign"))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), "xalign");
}
yalign = ETK_CLAMP(yalign, 0.0, 1.0);
if (yalign != alignment->yalign)
{
alignment->yalign = yalign;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), "yalign"))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), "yalign");
}
xscale = ETK_CLAMP(xscale, 0.0, 1.0);
if (xscale != alignment->xscale)
{
alignment->xscale = xscale;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), "xscale"))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), "xscale");
}
yscale = ETK_CLAMP(yscale, 0.0, 1.0);
if (yscale != alignment->yscale)
{
alignment->yscale = yscale;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), "yscale"))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), "yscale");
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_bin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_bin.c 8 Aug 2006 18:03:01 -0000 1.12
+++ etk_bin.c 13 Aug 2006 22:42:23 -0000 1.13
@@ -85,8 +85,7 @@
etk_widget_swallow_widget(ETK_WIDGET(bin), "swallow_area", bin->child);
bin->child = child;
- if (!etk_signal_emit_by_name("child_added", ETK_OBJECT(bin), NULL,
child))
- return;
+ etk_signal_emit_by_name("child_added", ETK_OBJECT(bin), NULL, child);
etk_object_notify(ETK_OBJECT(bin), "child");
}
}
@@ -212,8 +211,7 @@
etk_widget_parent_set_full(widget, NULL, ETK_FALSE);
bin->child = NULL;
- if (!etk_signal_emit_by_name("child_removed", ETK_OBJECT(bin), NULL,
widget))
- return;
+ etk_signal_emit_by_name("child_removed", ETK_OBJECT(bin), NULL, widget);
etk_object_notify(ETK_OBJECT(bin), "child");
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etk_button.c 13 Aug 2006 15:33:17 -0000 1.22
+++ etk_button.c 13 Aug 2006 22:42:23 -0000 1.23
@@ -284,14 +284,12 @@
if (button->xalign != xalign)
{
button->xalign = xalign;
- if (!etk_object_notify(ETK_OBJECT(button), "xalign"))
- return;
+ etk_object_notify(ETK_OBJECT(button), "xalign");
}
if (button->yalign != yalign)
{
button->yalign = yalign;
- if (!etk_object_notify(ETK_OBJECT(button), "yalign"))
- return;
+ etk_object_notify(ETK_OBJECT(button), "yalign");
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_colorpicker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_colorpicker.c 8 Aug 2006 00:57:33 -0000 1.18
+++ etk_colorpicker.c 13 Aug 2006 22:42:23 -0000 1.19
@@ -739,10 +739,7 @@
cp->current_color.b = color.b;
evas_object_color_set(cp->current_color_rect, color.r, color.g,
color.b, 255);
if (cp->emit_signal)
- {
- if
(!etk_signal_emit(_etk_colorpicker_signals[ETK_CP_COLOR_CHANGED_SIGNAL],
ETK_OBJECT(cp), NULL))
- return;
- }
+
etk_signal_emit(_etk_colorpicker_signals[ETK_CP_COLOR_CHANGED_SIGNAL],
ETK_OBJECT(cp), NULL);
}
update_sp_image = !((i != cp->mode) && ((i / 3) == (cp->mode / 3)));
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- etk_combobox.c 13 Aug 2006 19:20:28 -0000 1.24
+++ etk_combobox.c 13 Aug 2006 22:42:23 -0000 1.25
@@ -148,8 +148,7 @@
{
combobox->item_height = item_height;
combobox->item_height_set = ETK_TRUE;
- if (!etk_object_notify(ETK_OBJECT(combobox), "item_height"))
- return;
+ etk_object_notify(ETK_OBJECT(combobox), "item_height");
}
else if (combobox->item_height_set)
{
@@ -159,8 +158,7 @@
combobox->item_height = ETK_COMBOBOX_DEFAULT_ITEM_HEIGHT;
}
combobox->item_height_set = ETK_FALSE;
- if (!etk_object_notify(ETK_OBJECT(combobox), "item_height"))
- return;
+ etk_object_notify(ETK_OBJECT(combobox), "item_height");
}
}
@@ -305,8 +303,7 @@
if (combobox->active_item != item)
{
combobox->active_item = item;
- if
(!etk_signal_emit(_etk_combobox_signals[ETK_COMBOBOX_ACTIVE_ITEM_CHANGED_SIGNAL],
ETK_OBJECT(combobox), NULL))
- return;
+
etk_signal_emit(_etk_combobox_signals[ETK_COMBOBOX_ACTIVE_ITEM_CHANGED_SIGNAL],
ETK_OBJECT(combobox), NULL);
etk_object_notify(ETK_OBJECT(combobox), "active_item");
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_frame.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_frame.c 8 Aug 2006 18:03:01 -0000 1.9
+++ etk_frame.c 13 Aug 2006 22:42:23 -0000 1.10
@@ -75,8 +75,7 @@
{
free(frame->label);
frame->label = strdup(label);
- if (!etk_object_notify(ETK_OBJECT(frame), "label"))
- return;
+ etk_object_notify(ETK_OBJECT(frame), "label");
}
if (ETK_WIDGET(frame)->theme_object)
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- etk_image.c 8 Aug 2006 18:03:01 -0000 1.23
+++ etk_image.c 13 Aug 2006 22:42:23 -0000 1.24
@@ -135,35 +135,30 @@
free(image->filename);
image->filename = filename ? strdup(filename) : NULL;
- if (!etk_object_notify(ETK_OBJECT(image), "image_file"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "image_file");
if (image->edje_group)
{
free(image->edje_group);
image->edje_group = NULL;
- if (!etk_object_notify(ETK_OBJECT(image), "edje_group"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "edje_group");
}
if (image->edje_filename)
{
free(image->edje_filename);
image->edje_filename = NULL;
- if (!etk_object_notify(ETK_OBJECT(image), "edje_file"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "edje_file");
}
if (image->use_edje)
{
image->use_edje = ETK_FALSE;
image->object_type_changed = ETK_TRUE;
- if (!etk_object_notify(ETK_OBJECT(image), "use_edje"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "use_edje");
}
if (image->stock_id != ETK_STOCK_NO_STOCK)
{
image->stock_id = ETK_STOCK_NO_STOCK;
- if (!etk_object_notify(ETK_OBJECT(image), "stock_id"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "stock_id");
}
_etk_image_load(image);
@@ -198,36 +193,31 @@
{
free(image->edje_filename);
image->edje_filename = edje_filename ? strdup(edje_filename) : NULL;
- if (!etk_object_notify(ETK_OBJECT(image), "edje_file"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "edje_file");
}
if (image->edje_group != edje_group)
{
free(image->edje_group);
image->edje_group = edje_group ? strdup(edje_group) : NULL;
- if (!etk_object_notify(ETK_OBJECT(image), "edje_group"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "edje_group");
}
if (image->filename)
{
free(image->filename);
image->filename = NULL;
- if (!etk_object_notify(ETK_OBJECT(image), "image_file"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "image_file");
}
if (!image->use_edje)
{
image->use_edje = ETK_TRUE;
image->object_type_changed = ETK_TRUE;
- if (!etk_object_notify(ETK_OBJECT(image), "use_edje"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "use_edje");
}
if (image->stock_id != ETK_STOCK_NO_STOCK)
{
image->stock_id = ETK_STOCK_NO_STOCK;
- if (!etk_object_notify(ETK_OBJECT(image), "stock_id"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "stock_id");
}
_etk_image_load(image);
@@ -274,10 +264,8 @@
image->stock_id = stock_id;
image->stock_size = stock_size;
- if (!etk_object_notify(ETK_OBJECT(image), "stock_id"))
- return;
- if (!etk_object_notify(ETK_OBJECT(image), "stock_size"))
- return;
+ etk_object_notify(ETK_OBJECT(image), "stock_id");
+ etk_object_notify(ETK_OBJECT(image), "stock_size");
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_label.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_label.c 8 Aug 2006 18:03:01 -0000 1.19
+++ etk_label.c 13 Aug 2006 22:42:23 -0000 1.20
@@ -133,15 +133,13 @@
{
label->xalign = xalign;
need_redraw = ETK_TRUE;
- if (!etk_object_notify(ETK_OBJECT(label), "xalign"))
- return;
+ etk_object_notify(ETK_OBJECT(label), "xalign");
}
if (label->yalign != yalign)
{
label->yalign = yalign;
need_redraw = ETK_TRUE;
- if (!etk_object_notify(ETK_OBJECT(label), "yalign"))
- return;
+ etk_object_notify(ETK_OBJECT(label), "yalign");
}
if (need_redraw)
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_menu.c 8 Aug 2006 17:02:48 -0000 1.17
+++ etk_menu.c 13 Aug 2006 22:42:23 -0000 1.18
@@ -248,8 +248,7 @@
for (l = menu_shell->items; l; l = l->next)
etk_menu_item_deselect(ETK_MENU_ITEM(l->data));
- if (!etk_signal_emit(_etk_menu_signals[ETK_MENU_POPPED_DOWN_SIGNAL],
ETK_OBJECT(menu_shell), NULL))
- return;
+ etk_signal_emit(_etk_menu_signals[ETK_MENU_POPPED_DOWN_SIGNAL],
ETK_OBJECT(menu_shell), NULL);
if (menu_shell->parent)
etk_signal_emit_by_name("submenu_popped_down",
ETK_OBJECT(menu_shell->parent), NULL);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu_item.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_menu_item.c 8 Aug 2006 18:03:01 -0000 1.20
+++ etk_menu_item.c 13 Aug 2006 22:42:23 -0000 1.21
@@ -584,8 +584,7 @@
*group = evas_list_append(*group, radio_item);
radio_item->group = group;
- if (!etk_object_notify(ETK_OBJECT(radio_item), "group"))
- return;
+ etk_object_notify(ETK_OBJECT(radio_item), "group");
radio_item->can_uncheck = ETK_TRUE;
etk_menu_item_check_active_set(check_item, active);
@@ -921,8 +920,7 @@
return;
check_item->active = active;
- if
(!etk_signal_emit(_etk_menu_item_check_signals[ETK_MENU_ITEM_CHECK_TOGGLED_SIGNAL],
ETK_OBJECT(check_item), NULL))
- return;
+
etk_signal_emit(_etk_menu_item_check_signals[ETK_MENU_ITEM_CHECK_TOGGLED_SIGNAL],
ETK_OBJECT(check_item), NULL);
etk_object_notify(ETK_OBJECT(check_item), "active");
}
@@ -939,10 +937,8 @@
if (!check_item->active || (check_item->active && radio_item->can_uncheck))
{
check_item->active = active;
- if
(!etk_signal_emit(_etk_menu_item_check_signals[ETK_MENU_ITEM_CHECK_TOGGLED_SIGNAL],
ETK_OBJECT(check_item), NULL))
- return;
- if (!etk_object_notify(ETK_OBJECT(check_item), "active"))
- return;
+
etk_signal_emit(_etk_menu_item_check_signals[ETK_MENU_ITEM_CHECK_TOGGLED_SIGNAL],
ETK_OBJECT(check_item), NULL);
+ etk_object_notify(ETK_OBJECT(check_item), "active");
if (check_item->active)
{
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_radio_button.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_radio_button.c 8 Aug 2006 18:03:01 -0000 1.10
+++ etk_radio_button.c 13 Aug 2006 22:42:23 -0000 1.11
@@ -123,8 +123,7 @@
*group = evas_list_append(*group, radio_button);
radio_button->group = group;
- if (!etk_object_notify(ETK_OBJECT(radio_button), "group"))
- return;
+ etk_object_notify(ETK_OBJECT(radio_button), "group");
radio_button->can_uncheck = ETK_TRUE;
etk_toggle_button_active_set(toggle_button, active);
@@ -228,10 +227,8 @@
if (!toggle_button->active || (toggle_button->active &&
radio_button->can_uncheck))
{
toggle_button->active = active;
- if (!etk_signal_emit_by_name("toggled", ETK_OBJECT(toggle_button), NULL))
- return;
- if (!etk_object_notify(ETK_OBJECT(toggle_button), "active"))
- return;
+ etk_signal_emit_by_name("toggled", ETK_OBJECT(toggle_button), NULL);
+ etk_object_notify(ETK_OBJECT(toggle_button), "active");
if (toggle_button->active)
{
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_range.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_range.c 8 Aug 2006 18:03:01 -0000 1.13
+++ etk_range.c 13 Aug 2006 22:42:23 -0000 1.14
@@ -91,8 +91,7 @@
if (new_value != range->value)
{
range->value = new_value;
- if
(!(etk_signal_emit(_etk_range_signals[ETK_RANGE_VALUE_CHANGED_SIGNAL],
ETK_OBJECT(range), NULL, range->value)))
- return;
+ etk_signal_emit(_etk_range_signals[ETK_RANGE_VALUE_CHANGED_SIGNAL],
ETK_OBJECT(range), NULL, range->value);
etk_object_notify(ETK_OBJECT(range), "value");
}
}
@@ -126,14 +125,12 @@
if (range->lower != lower)
{
range->lower = lower;
- if (!etk_object_notify(ETK_OBJECT(range), "lower"))
- return;
+ etk_object_notify(ETK_OBJECT(range), "lower");
}
if (range->upper != upper)
{
range->upper = upper;
- if (!etk_object_notify(ETK_OBJECT(range), "upper"))
- return;
+ etk_object_notify(ETK_OBJECT(range), "upper");
}
etk_range_value_set(range, range->value);
@@ -169,14 +166,12 @@
if (range->step_increment != step)
{
range->step_increment = step;
- if (!etk_object_notify(ETK_OBJECT(range), "step_increment"))
- return;
+ etk_object_notify(ETK_OBJECT(range), "step_increment");
}
if (range->page_increment != page)
{
range->page_increment = page;
- if (!etk_object_notify(ETK_OBJECT(range), "page_increment"))
- return;
+ etk_object_notify(ETK_OBJECT(range), "page_increment");
}
}
@@ -209,8 +204,7 @@
{
range->page_size = page_size;
etk_widget_redraw_queue(ETK_WIDGET(range));
- if (!etk_object_notify(ETK_OBJECT(range), "page_size"))
- return;
+ etk_object_notify(ETK_OBJECT(range), "page_size");
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_scrolled_view.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_scrolled_view.c 8 Aug 2006 18:03:01 -0000 1.20
+++ etk_scrolled_view.c 13 Aug 2006 22:42:23 -0000 1.21
@@ -137,15 +137,13 @@
{
scrolled_view->hpolicy = hpolicy;
etk_widget_redraw_queue(ETK_WIDGET(scrolled_view));
- if (!etk_object_notify(ETK_OBJECT(scrolled_view), "hpolicy"))
- return;
+ etk_object_notify(ETK_OBJECT(scrolled_view), "hpolicy");
}
if (scrolled_view->vpolicy != vpolicy)
{
scrolled_view->vpolicy = vpolicy;
etk_widget_redraw_queue(ETK_WIDGET(scrolled_view));
- if (!etk_object_notify(ETK_OBJECT(scrolled_view), "vpolicy"))
- return;
+ etk_object_notify(ETK_OBJECT(scrolled_view), "vpolicy");
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_signal.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_signal.c 8 Aug 2006 00:57:33 -0000 1.15
+++ etk_signal.c 13 Aug 2006 22:42:23 -0000 1.16
@@ -282,21 +282,17 @@
* @param object the object which will emit the signal
* @param return_value the location where store the return value ( @a
return_value may be NULL)
* @param ... the arguments to pass to the callback function
- * @return Returns @a object, or NULL if @a object has been destroyed by one
of the callbacks
*/
-Etk_Object *etk_signal_emit(Etk_Signal *signal, Etk_Object *object, void
*return_value, ...)
+void etk_signal_emit(Etk_Signal *signal, Etk_Object *object, void
*return_value, ...)
{
va_list args;
- Etk_Object *ret_obj;
if (!object || !signal)
- return object;
+ return;
va_start(args, return_value);
- ret_obj = etk_signal_emit_valist(signal, object, return_value, args);
+ etk_signal_emit_valist(signal, object, return_value, args);
va_end(args);
-
- return ret_obj;
}
/**
@@ -305,28 +301,24 @@
* @param object the object which will emit the signal
* @param return_value the location where store the return value ( @a
return_value may be NULL)
* @param ... the arguments to pass to the callback function
- * @return Returns @a object, or NULL if @a object has been destroyed by one
of the callbacks
*/
-Etk_Object *etk_signal_emit_by_name(const char *signal_name, Etk_Object
*object, void *return_value, ...)
+void etk_signal_emit_by_name(const char *signal_name, Etk_Object *object, void
*return_value, ...)
{
va_list args;
Etk_Signal *signal;
- Etk_Object *ret_obj;
if (!object || !signal_name)
- return object;
+ return;
if (!(signal = etk_signal_lookup(signal_name,
etk_object_object_type_get(object))))
{
ETK_WARNING("Invalid signal emission: the object type doesn't have a
signal called \"%s\"", signal_name);
- return object;
+ return;
}
va_start(args, return_value);
- ret_obj = etk_signal_emit_valist(signal, object, return_value, args);
+ etk_signal_emit_valist(signal, object, return_value, args);
va_end(args);
-
- return ret_obj;
}
/**
@@ -337,7 +329,7 @@
* @param args the arguments to pass to the callback function
* @return Returns @a object, or NULL if @a object has been destroyed by one
of the callbacks
*/
-Etk_Object *etk_signal_emit_valist(Etk_Signal *signal, Etk_Object *object,
void *return_value, va_list args)
+void etk_signal_emit_valist(Etk_Signal *signal, Etk_Object *object, void
*return_value, va_list args)
{
Evas_List *callbacks;
Etk_Signal_Callback *callback;
@@ -348,7 +340,7 @@
void *object_ptr;
if (!object || !signal)
- return object;
+ return;
/* The pointer object will be set to NULL if the object is destroyed by a
callback */
object_ptr = object;
@@ -435,8 +427,6 @@
free(emitted_signal);
va_end(args2);
-
- return object_ptr;
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_signal.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_signal.h 8 Aug 2006 00:57:33 -0000 1.8
+++ etk_signal.h 13 Aug 2006 22:42:23 -0000 1.9
@@ -46,9 +46,9 @@
void etk_signal_connect_full(Etk_Signal *signal, Etk_Object *object,
Etk_Signal_Callback_Function callback, void *data, Etk_Bool swapped, Etk_Bool
after);
void etk_signal_disconnect(const char *signal_name, Etk_Object *object,
Etk_Signal_Callback_Function callback);
-Etk_Object *etk_signal_emit(Etk_Signal *signal, Etk_Object *object, void
*return_value, ...);
-Etk_Object *etk_signal_emit_by_name(const char *signal_name, Etk_Object
*object, void *return_value, ...);
-Etk_Object *etk_signal_emit_valist(Etk_Signal *signal, Etk_Object *object,
void *return_value, va_list args);
+void etk_signal_emit(Etk_Signal *signal, Etk_Object *object, void
*return_value, ...);
+void etk_signal_emit_by_name(const char *signal_name, Etk_Object *object, void
*return_value, ...);
+void etk_signal_emit_valist(Etk_Signal *signal, Etk_Object *object, void
*return_value, va_list args);
void etk_signal_stop();
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_string.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_string.c 8 Aug 2006 18:03:01 -0000 1.11
+++ etk_string.c 13 Aug 2006 22:42:23 -0000 1.12
@@ -145,8 +145,7 @@
{
string->string[length] = 0;
string->length = length;
- if (!etk_object_notify(ETK_OBJECT(string), "string"))
- return NULL;
+ etk_object_notify(ETK_OBJECT(string), "string");
}
return string;
}
@@ -238,8 +237,7 @@
string->string[string->length] = 0;
}
- if (!etk_object_notify(ETK_OBJECT(string), "string"))
- return NULL;
+ etk_object_notify(ETK_OBJECT(string), "string");
return string;
}
@@ -468,8 +466,7 @@
string->length += length;
string->string[string->length] = 0;
- if (!etk_object_notify(ETK_OBJECT(string), "string"))
- return NULL;
+ etk_object_notify(ETK_OBJECT(string), "string");
return string;
}
@@ -502,8 +499,7 @@
string->length++;
string->string[string->length] = 0;
- if (!etk_object_notify(ETK_OBJECT(string), "string"))
- return NULL;
+ etk_object_notify(ETK_OBJECT(string), "string");
return string;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_table.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_table.c 8 Aug 2006 18:03:01 -0000 1.16
+++ etk_table.c 13 Aug 2006 22:42:23 -0000 1.17
@@ -182,10 +182,8 @@
table->num_rows = num_rows;
etk_widget_size_recalc_queue(ETK_WIDGET(table));
- if (!etk_object_notify(ETK_OBJECT(table), "num_cols"))
- return;
- if (!etk_object_notify(ETK_OBJECT(table), "num_rows"))
- return;
+ etk_object_notify(ETK_OBJECT(table), "num_cols");
+ etk_object_notify(ETK_OBJECT(table), "num_rows");
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toggle_button.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_toggle_button.c 8 Aug 2006 18:03:02 -0000 1.11
+++ etk_toggle_button.c 13 Aug 2006 22:42:23 -0000 1.12
@@ -204,8 +204,7 @@
return;
toggle_button->active = active;
- if
(!etk_signal_emit(_etk_toggle_button_signals[ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL],
ETK_OBJECT(toggle_button), NULL))
- return;
+
etk_signal_emit(_etk_toggle_button_signals[ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL],
ETK_OBJECT(toggle_button), NULL);
etk_object_notify(ETK_OBJECT(toggle_button), "active");
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- etk_tree.c 8 Aug 2006 18:51:22 -0000 1.71
+++ etk_tree.c 13 Aug 2006 22:42:23 -0000 1.72
@@ -745,14 +745,12 @@
if (tree->last_selected && tree->last_selected->selected)
{
tree->last_selected->selected = ETK_FALSE;
- if (!etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_UNSELECTED_SIGNAL],
ETK_OBJECT(tree), NULL, tree->last_selected))
- return;
+ etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_UNSELECTED_SIGNAL],
ETK_OBJECT(tree), NULL, tree->last_selected);
}
if (tree->multiple_select)
{
_etk_tree_row_unselect_all(&tree->root);
- if (!etk_signal_emit(_etk_tree_signals[ETK_TREE_UNSELECT_ALL_SIGNAL],
ETK_OBJECT(tree), NULL))
- return;
+ etk_signal_emit(_etk_tree_signals[ETK_TREE_UNSELECT_ALL_SIGNAL],
ETK_OBJECT(tree), NULL);
}
tree->num_selected_rows = 0;
etk_widget_redraw_queue(ETK_WIDGET(tree->grid));
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- etk_widget.c 13 Aug 2006 19:20:28 -0000 1.70
+++ etk_widget.c 13 Aug 2006 22:42:23 -0000 1.71
@@ -704,8 +704,7 @@
evas_object_show(widget->smart_object);
etk_widget_size_recalc_queue(widget);
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_SHOW_SIGNAL],
ETK_OBJECT(widget), NULL))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_SHOW_SIGNAL],
ETK_OBJECT(widget), NULL);
etk_object_notify(ETK_OBJECT(widget), "visible");
}
@@ -740,8 +739,7 @@
evas_object_hide(widget->smart_object);
etk_widget_size_recalc_queue(widget);
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_HIDE_SIGNAL],
ETK_OBJECT(widget), NULL))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_HIDE_SIGNAL],
ETK_OBJECT(widget), NULL);
etk_object_notify(ETK_OBJECT(widget), "visible");
}
@@ -904,10 +902,8 @@
widget->requested_size.h = h;
etk_widget_size_recalc_queue(widget);
- if (!etk_object_notify(ETK_OBJECT(widget), "width_request"))
- return;
- if (!etk_object_notify(ETK_OBJECT(widget), "height_request"))
- return;
+ etk_object_notify(ETK_OBJECT(widget), "width_request");
+ etk_object_notify(ETK_OBJECT(widget), "height_request");
}
/**
@@ -2222,8 +2218,7 @@
event.locks = evas_event->locks;
event.timestamp = evas_event->timestamp;
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_IN_SIGNAL],
ETK_OBJECT(widget), NULL, &event))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_IN_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
/* TODO: should we really propagate the mouse in event? */
if (widget->parent)
@@ -2257,8 +2252,7 @@
event.locks = evas_event->locks;
event.timestamp = evas_event->timestamp;
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_OUT_SIGNAL],
ETK_OBJECT(widget), NULL, &event))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_OUT_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
/* TODO: should we really propagate the mouse out event? */
if (widget->parent)
@@ -2296,8 +2290,7 @@
event.locks = evas_event->locks;
event.timestamp = evas_event->timestamp;
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_MOVE_SIGNAL],
ETK_OBJECT(widget), NULL, &event))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_MOVE_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
if (widget->parent)
_etk_widget_mouse_move_cb(widget->parent, evas, NULL, event_info);
@@ -2323,8 +2316,7 @@
event.flags = evas_event->flags;
event.timestamp = evas_event->timestamp;
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_DOWN_SIGNAL],
ETK_OBJECT(widget), NULL, &event))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_DOWN_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
if (widget->repeat_mouse_events && widget->parent)
_etk_widget_mouse_down_cb(widget->parent, evas, NULL, event_info);
@@ -2361,14 +2353,12 @@
event.flags = evas_event->flags;
event.timestamp = evas_event->timestamp;
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_UP_SIGNAL],
ETK_OBJECT(widget), NULL, &event))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_UP_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
if (evas_event->canvas.x >= widget->geometry.x && evas_event->canvas.x <=
widget->geometry.x + widget->geometry.w &&
evas_event->canvas.y >= widget->geometry.y && evas_event->canvas.y <=
widget->geometry.y + widget->geometry.h)
{
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_CLICK_SIGNAL],
ETK_OBJECT(widget), NULL, &event))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_CLICK_SIGNAL],
ETK_OBJECT(widget), NULL, &event);
}
if (widget->repeat_mouse_events && widget->parent)
@@ -2587,8 +2577,7 @@
widget->need_theme_min_size_recalc = ETK_TRUE;
widget->realized = ETK_TRUE;
- if (!etk_signal_emit(_etk_widget_signals[ETK_WIDGET_REALIZE_SIGNAL],
ETK_OBJECT(widget), NULL))
- return;
+ etk_signal_emit(_etk_widget_signals[ETK_WIDGET_REALIZE_SIGNAL],
ETK_OBJECT(widget), NULL);
/* Finally, we clip the widget */
if (widget->clip)
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_window.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- etk_window.c 8 Aug 2006 15:55:55 -0000 1.34
+++ etk_window.c 13 Aug 2006 22:42:23 -0000 1.35
@@ -735,24 +735,21 @@
/* Called when the window is resized by the engine */
static void _etk_window_resize_cb(Etk_Window *window)
{
- if (!etk_signal_emit(_etk_window_signals[ETK_WINDOW_RESIZE_SIGNAL],
ETK_OBJECT(window), NULL))
- return;
+ etk_signal_emit(_etk_window_signals[ETK_WINDOW_RESIZE_SIGNAL],
ETK_OBJECT(window), NULL);
etk_widget_redraw_queue(ETK_WIDGET(window));
}
/* Called when the window is focused by the engine */
static void _etk_window_focus_in_cb(Etk_Window *window)
{
- if (!etk_signal_emit(_etk_window_signals[ETK_WINDOW_FOCUS_IN_SIGNAL],
ETK_OBJECT(window), NULL))
- return;
+ etk_signal_emit(_etk_window_signals[ETK_WINDOW_FOCUS_IN_SIGNAL],
ETK_OBJECT(window), NULL);
etk_object_notify(ETK_OBJECT(window), "focused");
}
/* Called when the window is unfocused by the engine */
static void _etk_window_focus_out_cb(Etk_Window *window)
{
- if (!etk_signal_emit(_etk_window_signals[ETK_WINDOW_FOCUS_OUT_SIGNAL],
ETK_OBJECT(window), NULL))
- return;
+ etk_signal_emit(_etk_window_signals[ETK_WINDOW_FOCUS_OUT_SIGNAL],
ETK_OBJECT(window), NULL);
etk_object_notify(ETK_OBJECT(window), "focused");
}
@@ -767,7 +764,8 @@
{
Etk_Bool result;
- if (etk_signal_emit(_etk_window_signals[ETK_WINDOW_DELETE_EVENT_SIGNAL],
ETK_OBJECT(window), &result) && !result)
+ etk_signal_emit(_etk_window_signals[ETK_WINDOW_DELETE_EVENT_SIGNAL],
ETK_OBJECT(window), &result);
+ if (!result)
etk_object_destroy(ETK_OBJECT(window));
}
-------------------------------------------------------------------------
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
