summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-01-21 23:16:41 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-01-21 23:18:16 +0900
commite3372339d8dbfaa4d85eae118bb940021fe6b2ce (patch)
tree0e6da47e9650aff2cd1e5cac93f9958e569c5c55
parent0b4b942bfc2ebb9c4ac7349232ff6fd428d21e1a (diff)
elm: Removed unnecessary null check for ecore_timer_del,
ecore_animator_del, and ecore_job_del. As all efl public free apis get null as valid parameter, we do not need to check null. I also removed some null check for other free apis which were right next to timer/animator/job del. After this job code got cleaner.
-rw-r--r--src/lib/elc_naviframe.c10
-rw-r--r--src/lib/elm_actionslider.c6
-rw-r--r--src/lib/elm_box.c2
-rw-r--r--src/lib/elm_calendar.c14
-rw-r--r--src/lib/elm_clock.c8
-rw-r--r--src/lib/elm_cnp.c3
-rw-r--r--src/lib/elm_colorselector.c4
-rw-r--r--src/lib/elm_config.c4
-rw-r--r--src/lib/elm_conform.c12
-rw-r--r--src/lib/elm_entry.c30
-rw-r--r--src/lib/elm_flip.c6
-rw-r--r--src/lib/elm_flipselector.c6
-rw-r--r--src/lib/elm_gengrid.c32
-rw-r--r--src/lib/elm_genlist.c61
-rw-r--r--src/lib/elm_gesture_layer.c2
-rw-r--r--src/lib/elm_image.c6
-rw-r--r--src/lib/elm_index.c6
-rw-r--r--src/lib/elm_interface_scrollable.c16
-rw-r--r--src/lib/elm_list.c4
-rw-r--r--src/lib/elm_map.c22
-rw-r--r--src/lib/elm_notify.c4
-rw-r--r--src/lib/elm_photo.c4
-rw-r--r--src/lib/elm_photocam.c29
-rw-r--r--src/lib/elm_slider.c10
-rw-r--r--src/lib/elm_slideshow.c2
-rw-r--r--src/lib/elm_spinner.c14
-rw-r--r--src/lib/elm_store.c4
-rw-r--r--src/lib/elm_toolbar.c8
-rw-r--r--src/lib/elm_video.c2
-rw-r--r--src/lib/elm_web.c10
-rw-r--r--src/lib/elm_win.c21
-rw-r--r--src/lib/els_tooltip.c2
32 files changed, 175 insertions, 189 deletions
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index cd236181b..6143f2ae0 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -504,7 +504,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
504 nit = (Elm_Naviframe_Item *)it; 504 nit = (Elm_Naviframe_Item *)it;
505 ELM_NAVIFRAME_DATA_GET(WIDGET(nit), sd); 505 ELM_NAVIFRAME_DATA_GET(WIDGET(nit), sd);
506 506
507 if (nit->animator) ecore_animator_del(nit->animator); 507 ecore_animator_del(nit->animator);
508 508
509 top = (it == elm_naviframe_top_item_get(WIDGET(nit))); 509 top = (it == elm_naviframe_top_item_get(WIDGET(nit)));
510 if (evas_object_data_get(VIEW(nit), "out_of_list")) 510 if (evas_object_data_get(VIEW(nit), "out_of_list"))
@@ -1397,7 +1397,7 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1397 //All popping items which are not called yet by animator. 1397 //All popping items which are not called yet by animator.
1398 EINA_LIST_FREE(sd->popping, it) 1398 EINA_LIST_FREE(sd->popping, it)
1399 { 1399 {
1400 if (it->animator) ecore_animator_del(it->animator); 1400 ecore_animator_del(it->animator);
1401 elm_widget_item_del(it); 1401 elm_widget_item_del(it);
1402 } 1402 }
1403 1403
@@ -1542,7 +1542,7 @@ _item_push(Eo *obj, void *_pd, va_list *list)
1542 prev_it->unfocusable = elm_widget_tree_unfocusable_get(VIEW(prev_it)); 1542 prev_it->unfocusable = elm_widget_tree_unfocusable_get(VIEW(prev_it));
1543 elm_widget_tree_unfocusable_set(VIEW(prev_it), EINA_TRUE); 1543 elm_widget_tree_unfocusable_set(VIEW(prev_it), EINA_TRUE);
1544 1544
1545 if (it->animator) ecore_animator_del(it->animator); 1545 ecore_animator_del(it->animator);
1546 it->animator = ecore_animator_add(_push_transition_cb, it); 1546 it->animator = ecore_animator_add(_push_transition_cb, it);
1547 } 1547 }
1548 else 1548 else
@@ -1738,7 +1738,7 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
1738 edje_object_message_signal_process(elm_layout_edje_get(VIEW(it))); 1738 edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
1739 edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it))); 1739 edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
1740 1740
1741 if (it->animator) ecore_animator_del(it->animator); 1741 ecore_animator_del(it->animator);
1742 it->animator = ecore_animator_add(_pop_transition_cb, it); 1742 it->animator = ecore_animator_add(_pop_transition_cb, it);
1743 sd->popping = eina_list_append(sd->popping, it); 1743 sd->popping = eina_list_append(sd->popping, it);
1744 } 1744 }
@@ -1824,7 +1824,7 @@ elm_naviframe_item_promote(Elm_Object_Item *it)
1824 1824
1825 edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it))); 1825 edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
1826 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit))); 1826 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit)));
1827 if (nit->animator) ecore_animator_del(nit->animator); 1827 ecore_animator_del(nit->animator);
1828 nit->animator = ecore_animator_add(_push_transition_cb, nit); 1828 nit->animator = ecore_animator_add(_push_transition_cb, nit);
1829} 1829}
1830 1830
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 7426417ca..8106f15e8 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -285,7 +285,7 @@ _drag_button_up_cb(void *data,
285 sd->final_position = 0.5; 285 sd->final_position = 0.5;
286 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center); 286 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center);
287 287
288 if (sd->button_animator) ecore_animator_del(sd->button_animator); 288 ecore_animator_del(sd->button_animator);
289 sd->button_animator = ecore_animator_add(_button_animator, obj); 289 sd->button_animator = ecore_animator_add(_button_animator, obj);
290 290
291 return; 291 return;
@@ -344,7 +344,7 @@ _drag_button_up_cb(void *data,
344 else 344 else
345 sd->final_position = 0; 345 sd->final_position = 0;
346 } 346 }
347 if (sd->button_animator) ecore_animator_del(sd->button_animator); 347 ecore_animator_del(sd->button_animator);
348 sd->button_animator = ecore_animator_add(_button_animator, obj); 348 sd->button_animator = ecore_animator_add(_button_animator, obj);
349} 349}
350 350
@@ -411,7 +411,7 @@ _track_move_cb(void *data,
411 sd->final_position = 0.0; 411 sd->final_position = 0.0;
412 } 412 }
413 } 413 }
414 if (sd->button_animator) ecore_animator_del(sd->button_animator); 414 ecore_animator_del(sd->button_animator);
415 sd->button_animator = ecore_animator_add(_button_animator, obj); 415 sd->button_animator = ecore_animator_add(_button_animator, obj);
416} 416}
417 417
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index dbf6b85e7..f214a1fdc 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -788,7 +788,7 @@ elm_box_transition_free(void *data)
788 (box_data->box, SIG_CHILD_ADDED, _transition_layout_child_added); 788 (box_data->box, SIG_CHILD_ADDED, _transition_layout_child_added);
789 evas_object_smart_callback_del 789 evas_object_smart_callback_del
790 (box_data->box, SIG_CHILD_REMOVED, _transition_layout_child_removed); 790 (box_data->box, SIG_CHILD_REMOVED, _transition_layout_child_removed);
791 if (box_data->animator) ecore_animator_del(box_data->animator); 791 ecore_animator_del(box_data->animator);
792 792
793 free(data); 793 free(data);
794} 794}
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 6724b5ffe..c177b764f 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -675,7 +675,7 @@ _button_month_inc_start(void *data,
675 675
676 sd->interval = sd->first_interval; 676 sd->interval = sd->first_interval;
677 sd->spin_speed = 1; 677 sd->spin_speed = 1;
678 if (sd->spin_month) ecore_timer_del(sd->spin_month); 678 ecore_timer_del(sd->spin_month);
679 sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data); 679 sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data);
680 680
681 _spin_month_value(data); 681 _spin_month_value(data);
@@ -691,7 +691,7 @@ _button_month_dec_start(void *data,
691 691
692 sd->interval = sd->first_interval; 692 sd->interval = sd->first_interval;
693 sd->spin_speed = -1; 693 sd->spin_speed = -1;
694 if (sd->spin_month) ecore_timer_del(sd->spin_month); 694 ecore_timer_del(sd->spin_month);
695 sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data); 695 sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data);
696 696
697 _spin_month_value(data); 697 _spin_month_value(data);
@@ -719,7 +719,7 @@ _button_year_inc_start(void *data,
719 719
720 sd->interval = sd->first_interval; 720 sd->interval = sd->first_interval;
721 sd->spin_speed = 1; 721 sd->spin_speed = 1;
722 if (sd->spin_year) ecore_timer_del(sd->spin_year); 722 ecore_timer_del(sd->spin_year);
723 sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data); 723 sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data);
724 724
725 _spin_year_value(data); 725 _spin_year_value(data);
@@ -735,7 +735,7 @@ _button_year_dec_start(void *data,
735 735
736 sd->interval = sd->first_interval; 736 sd->interval = sd->first_interval;
737 sd->spin_speed = -1; 737 sd->spin_speed = -1;
738 if (sd->spin_year) ecore_timer_del(sd->spin_year); 738 ecore_timer_del(sd->spin_year);
739 sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data); 739 sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data);
740 740
741 _spin_year_value(data); 741 _spin_year_value(data);
@@ -1030,9 +1030,9 @@ _elm_calendar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1030 Elm_Calendar_Mark *mark; 1030 Elm_Calendar_Mark *mark;
1031 Elm_Calendar_Smart_Data *sd = _pd; 1031 Elm_Calendar_Smart_Data *sd = _pd;
1032 1032
1033 if (sd->spin_month) ecore_timer_del(sd->spin_month); 1033 ecore_timer_del(sd->spin_month);
1034 if (sd->spin_year) ecore_timer_del(sd->spin_year); 1034 ecore_timer_del(sd->spin_year);
1035 if (sd->update_timer) ecore_timer_del(sd->update_timer); 1035 ecore_timer_del(sd->update_timer);
1036 1036
1037 if (sd->marks) 1037 if (sd->marks)
1038 { 1038 {
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index d7d6900c7..51b2b4fd8 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -145,7 +145,7 @@ _on_clock_val_up_start(void *data,
145 145
146 sd->interval = sd->first_interval; 146 sd->interval = sd->first_interval;
147 sd->sel_obj = obj; 147 sd->sel_obj = obj;
148 if (sd->spin) ecore_timer_del(sd->spin); 148 ecore_timer_del(sd->spin);
149 sd->spin = ecore_timer_add(sd->interval, _on_clock_val_up, data); 149 sd->spin = ecore_timer_add(sd->interval, _on_clock_val_up, data);
150 150
151 _on_clock_val_up(data); 151 _on_clock_val_up(data);
@@ -161,7 +161,7 @@ _on_clock_val_down_start(void *data,
161 161
162 sd->interval = sd->first_interval; 162 sd->interval = sd->first_interval;
163 sd->sel_obj = obj; 163 sd->sel_obj = obj;
164 if (sd->spin) ecore_timer_del(sd->spin); 164 ecore_timer_del(sd->spin);
165 sd->spin = ecore_timer_add(sd->interval, _on_clock_val_down, data); 165 sd->spin = ecore_timer_add(sd->interval, _on_clock_val_down, data);
166 166
167 _on_clock_val_down(data); 167 _on_clock_val_down(data);
@@ -705,8 +705,8 @@ _elm_clock_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
705{ 705{
706 Elm_Clock_Smart_Data *sd = _pd; 706 Elm_Clock_Smart_Data *sd = _pd;
707 707
708 if (sd->ticker) ecore_timer_del(sd->ticker); 708 ecore_timer_del(sd->ticker);
709 if (sd->spin) ecore_timer_del(sd->spin); 709 ecore_timer_del(sd->spin);
710 710
711 /* NB: digits are killed for being sub objects, automatically */ 711 /* NB: digits are killed for being sub objects, automatically */
712 712
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 9febad718..daca9fb83 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -4119,8 +4119,7 @@ _cont_obj_mouse_down(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *ev
4119 evas_object_event_callback_add(st->obj, EVAS_CALLBACK_MOUSE_UP, 4119 evas_object_event_callback_add(st->obj, EVAS_CALLBACK_MOUSE_UP,
4120 _cont_obj_mouse_up, st); 4120 _cont_obj_mouse_up, st);
4121 4121
4122 if (st->tm) 4122 ecore_timer_del(st->tm);
4123 ecore_timer_del(st->tm);
4124 4123
4125 st->e = e; 4124 st->e = e;
4126 st->x_down = ev->canvas.x; 4125 st->x_down = ev->canvas.x;
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 4c3431fda..2c5cc20da 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1304,7 +1304,7 @@ _on_color_pressed(void *data,
1304 elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm"); 1304 elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
1305 sd->longpressed = EINA_FALSE; 1305 sd->longpressed = EINA_FALSE;
1306 1306
1307 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer); 1307 ecore_timer_del(sd->longpress_timer);
1308 sd->longpress_timer = ecore_timer_add 1308 sd->longpress_timer = ecore_timer_add
1309 (_elm_config->longpress_timeout, _on_color_long_press, data); 1309 (_elm_config->longpress_timeout, _on_color_long_press, data);
1310} 1310}
@@ -1586,7 +1586,7 @@ _elm_colorselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1586 evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_IN, _mouse_in_canvas, obj); 1586 evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_IN, _mouse_in_canvas, obj);
1587 evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_OUT, _mouse_out_canvas, obj); 1587 evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_OUT, _mouse_out_canvas, obj);
1588 1588
1589 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer); 1589 ecore_timer_del(sd->longpress_timer);
1590 if (sd->palette_name) eina_stringshare_del(sd->palette_name); 1590 if (sd->palette_name) eina_stringshare_del(sd->palette_name);
1591 1591
1592#ifdef HAVE_ELEMENTARY_X 1592#ifdef HAVE_ELEMENTARY_X
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 344e3e1e5..222e04a0e 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -234,13 +234,13 @@ _prop_change(void *data EINA_UNUSED,
234 { 234 {
235 if (event->atom == _atom[ATOM_E_PROFILE]) 235 if (event->atom == _atom[ATOM_E_PROFILE])
236 { 236 {
237 if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer); 237 ecore_timer_del(_prop_change_delay_timer);
238 _prop_change_delay_timer = ecore_timer_add(0.1, _prop_change_delay_cb, NULL); 238 _prop_change_delay_timer = ecore_timer_add(0.1, _prop_change_delay_cb, NULL);
239 } 239 }
240 else if (((_atom_config > 0) && (event->atom == _atom_config)) || 240 else if (((_atom_config > 0) && (event->atom == _atom_config)) ||
241 (event->atom == _atom[ATOM_E_CONFIG])) 241 (event->atom == _atom[ATOM_E_CONFIG]))
242 { 242 {
243 if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer); 243 ecore_timer_del(_prop_change_delay_timer);
244 _prop_change_delay_timer = ecore_timer_add(0.1, _prop_change_delay_cb, NULL); 244 _prop_change_delay_timer = ecore_timer_add(0.1, _prop_change_delay_cb, NULL);
245 } 245 }
246 } 246 }
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 317d3c458..d487db0c9 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -714,7 +714,7 @@ _on_content_resize(void *data,
714 (sd->clipboard_state == ECORE_X_ILLUME_CLIPBOARD_STATE_OFF)) 714 (sd->clipboard_state == ECORE_X_ILLUME_CLIPBOARD_STATE_OFF))
715 return; 715 return;
716 716
717 if (sd->show_region_job) ecore_job_del(sd->show_region_job); 717 ecore_job_del(sd->show_region_job);
718 sd->show_region_job = ecore_job_add(_show_region_job, data); 718 sd->show_region_job = ecore_job_add(_show_region_job, data);
719} 719}
720 720
@@ -927,11 +927,11 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
927 if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl); 927 if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl);
928#endif 928#endif
929 929
930 if (sd->show_region_job) ecore_job_del(sd->show_region_job); 930 ecore_job_del(sd->show_region_job);
931 if (sd->port_indi_timer) ecore_timer_del(sd->port_indi_timer); 931 ecore_timer_del(sd->port_indi_timer);
932 if (sd->land_indi_timer) ecore_timer_del(sd->land_indi_timer); 932 ecore_timer_del(sd->land_indi_timer);
933 if (sd->portrait_indicator) evas_object_del(sd->portrait_indicator); 933 evas_object_del(sd->portrait_indicator);
934 if (sd->landscape_indicator) evas_object_del(sd->landscape_indicator); 934 evas_object_del(sd->landscape_indicator);
935 935
936 top = elm_widget_top_get(obj); 936 top = elm_widget_top_get(obj);
937 evas_object_data_set(top, "\377 elm,conformant", NULL); 937 evas_object_data_set(top, "\377 elm,conformant", NULL);
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 51d321fd3..7fa3b135f 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -832,8 +832,7 @@ _elm_entry_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
832 } 832 }
833 else 833 else
834 { 834 {
835 if (sd->deferred_recalc_job) 835 ecore_job_del(sd->deferred_recalc_job);
836 ecore_job_del(sd->deferred_recalc_job);
837 sd->deferred_recalc_job = 836 sd->deferred_recalc_job =
838 ecore_job_add(_deferred_recalc_job, obj); 837 ecore_job_add(_deferred_recalc_job, obj);
839 } 838 }
@@ -1080,7 +1079,7 @@ _hover_dismissed_cb(void *data,
1080 } 1079 }
1081 } 1080 }
1082 elm_widget_scroll_freeze_pop(data); 1081 elm_widget_scroll_freeze_pop(data);
1083 if (sd->hov_deljob) ecore_job_del(sd->hov_deljob); 1082 ecore_job_del(sd->hov_deljob);
1084 sd->hov_deljob = ecore_job_add(_hover_del_job, data); 1083 sd->hov_deljob = ecore_job_add(_hover_del_job, data);
1085} 1084}
1086 1085
@@ -3392,27 +3391,24 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
3392 3391
3393 evas_event_freeze(evas_object_evas_get(obj)); 3392 evas_event_freeze(evas_object_evas_get(obj));
3394 3393
3395 if (sd->file) eina_stringshare_del(sd->file); 3394 eina_stringshare_del(sd->file);
3396 3395
3397 if (sd->hov_deljob) ecore_job_del(sd->hov_deljob); 3396 ecore_job_del(sd->hov_deljob);
3398 if ((sd->api) && (sd->api->obj_unhook)) 3397 if ((sd->api) && (sd->api->obj_unhook))
3399 sd->api->obj_unhook(obj); // module - unhook 3398 sd->api->obj_unhook(obj); // module - unhook
3400 3399
3401 if (sd->mgf_proxy) evas_object_del(sd->mgf_proxy); 3400 evas_object_del(sd->mgf_proxy);
3402 if (sd->mgf_bg) evas_object_del(sd->mgf_bg); 3401 evas_object_del(sd->mgf_bg);
3403 if (sd->mgf_clip) evas_object_del(sd->mgf_clip); 3402 evas_object_del(sd->mgf_clip);
3404 3403
3405 entries = eina_list_remove(entries, obj); 3404 entries = eina_list_remove(entries, obj);
3406#ifdef HAVE_ELEMENTARY_X 3405#ifdef HAVE_ELEMENTARY_X
3407 if (sd->sel_notify_handler) 3406 ecore_event_handler_del(sd->sel_notify_handler);
3408 ecore_event_handler_del(sd->sel_notify_handler); 3407 ecore_event_handler_del(sd->sel_clear_handler);
3409 if (sd->sel_clear_handler)
3410 ecore_event_handler_del(sd->sel_clear_handler);
3411#endif 3408#endif
3412 if (sd->cut_sel) eina_stringshare_del(sd->cut_sel); 3409 eina_stringshare_del(sd->cut_sel);
3413 if (sd->text) eina_stringshare_del(sd->text); 3410 eina_stringshare_del(sd->text);
3414 if (sd->deferred_recalc_job) 3411 ecore_job_del(sd->deferred_recalc_job);
3415 ecore_job_del(sd->deferred_recalc_job);
3416 if (sd->append_text_idler) 3412 if (sd->append_text_idler)
3417 { 3413 {
3418 ecore_idler_del(sd->append_text_idler); 3414 ecore_idler_del(sd->append_text_idler);
@@ -3420,7 +3416,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
3420 sd->append_text_left = NULL; 3416 sd->append_text_left = NULL;
3421 sd->append_text_idler = NULL; 3417 sd->append_text_idler = NULL;
3422 } 3418 }
3423 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer); 3419 ecore_timer_del(sd->longpress_timer);
3424 EINA_LIST_FREE(sd->items, it) 3420 EINA_LIST_FREE(sd->items, it)
3425 { 3421 {
3426 eina_stringshare_del(it->label); 3422 eina_stringshare_del(it->label);
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 45eb2b087..f1087374c 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1650,7 +1650,7 @@ _up_cb(void *data,
1650 if (!sd->finish) tm = 1.0 - tm; 1650 if (!sd->finish) tm = 1.0 - tm;
1651 else sd->next_state = !sd->state; 1651 else sd->next_state = !sd->state;
1652 tm *= 1.0; // FIXME: config for anim time 1652 tm *= 1.0; // FIXME: config for anim time
1653 if (sd->animator) ecore_animator_del(sd->animator); 1653 ecore_animator_del(sd->animator);
1654 sd->animator = ecore_animator_timeline_add(tm, _event_anim, sd); 1654 sd->animator = ecore_animator_timeline_add(tm, _event_anim, sd);
1655 sd->len = tm; 1655 sd->len = tm;
1656 sd->start = ecore_loop_time_get(); 1656 sd->start = ecore_loop_time_get();
@@ -1731,7 +1731,7 @@ _move_cb(void *data,
1731 } 1731 }
1732 1732
1733 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1733 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1734 if (sd->job) ecore_job_del(sd->job); 1734 ecore_job_del(sd->job);
1735 sd->job = ecore_job_add(_update_job, fl); 1735 sd->job = ecore_job_add(_update_job, fl);
1736} 1736}
1737 1737
@@ -1889,7 +1889,7 @@ _elm_flip_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1889{ 1889{
1890 Elm_Flip_Smart_Data *sd = _pd; 1890 Elm_Flip_Smart_Data *sd = _pd;
1891 1891
1892 if (sd->animator) ecore_animator_del(sd->animator); 1892 ecore_animator_del(sd->animator);
1893 _state_slices_clear(sd); 1893 _state_slices_clear(sd);
1894 1894
1895 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 1895 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index fead756d5..9bb8803da 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -497,7 +497,7 @@ _signal_val_up_start(void *data,
497 497
498 sd->interval = sd->first_interval; 498 sd->interval = sd->first_interval;
499 499
500 if (sd->spin) ecore_timer_del(sd->spin); 500 ecore_timer_del(sd->spin);
501 sd->spin = ecore_timer_add(sd->interval, _signal_val_up, data); 501 sd->spin = ecore_timer_add(sd->interval, _signal_val_up, data);
502 502
503 _signal_val_up(data); 503 _signal_val_up(data);
@@ -530,7 +530,7 @@ _signal_val_down_start(void *data,
530 530
531 sd->interval = sd->first_interval; 531 sd->interval = sd->first_interval;
532 532
533 if (sd->spin) ecore_timer_del(sd->spin); 533 ecore_timer_del(sd->spin);
534 sd->spin = ecore_timer_add(sd->interval, _signal_val_down, data); 534 sd->spin = ecore_timer_add(sd->interval, _signal_val_down, data);
535 535
536 _signal_val_down(data); 536 _signal_val_down(data);
@@ -587,7 +587,7 @@ _elm_flipselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
587 while (sd->items) 587 while (sd->items)
588 elm_widget_item_del(DATA_GET(sd->items)); 588 elm_widget_item_del(DATA_GET(sd->items));
589 589
590 if (sd->spin) ecore_timer_del(sd->spin); 590 ecore_timer_del(sd->spin);
591 591
592 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 592 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
593} 593}
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index e2a242983..6665c9741 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -267,7 +267,7 @@ _elm_gengrid_pan_smart_move(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
267 va_arg(*list, Evas_Coord); 267 va_arg(*list, Evas_Coord);
268 va_arg(*list, Evas_Coord); 268 va_arg(*list, Evas_Coord);
269 269
270 if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job); 270 ecore_job_del(psd->wsd->calc_job);
271 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj); 271 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
272} 272}
273 273
@@ -282,7 +282,7 @@ _elm_gengrid_pan_smart_resize(Eo *obj, void *_pd, va_list *list)
282 282
283 evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); 283 evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
284 if ((ow == w) && (oh == h)) return; 284 if ((ow == w) && (oh == h)) return;
285 if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job); 285 ecore_job_del(psd->wsd->calc_job);
286 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj); 286 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
287} 287}
288 288
@@ -359,7 +359,7 @@ _item_mouse_move_cb(void *data,
359 sd->reorder_item_y = oy + oh - sd->item_height; 359 sd->reorder_item_y = oy + oh - sd->item_height;
360 else sd->reorder_item_y = it_scrl_y; 360 else sd->reorder_item_y = it_scrl_y;
361 361
362 if (sd->calc_job) ecore_job_del(sd->calc_job); 362 ecore_job_del(sd->calc_job);
363 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 363 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
364 } 364 }
365 return; 365 return;
@@ -594,8 +594,7 @@ _item_mouse_up_cb(void *data,
594 (WIDGET(it), SIG_MOVED, sd->reorder_it); 594 (WIDGET(it), SIG_MOVED, sd->reorder_it);
595 sd->reorder_it = NULL; 595 sd->reorder_it = NULL;
596 sd->move_effect_enabled = EINA_FALSE; 596 sd->move_effect_enabled = EINA_FALSE;
597 if (sd->calc_job) 597 ecore_job_del(sd->calc_job);
598 ecore_job_del(sd->calc_job);
599 sd->calc_job = 598 sd->calc_job =
600 ecore_job_add(_calc_job, sd->obj); 599 ecore_job_add(_calc_job, sd->obj);
601 600
@@ -1243,8 +1242,7 @@ _item_place(Elm_Gen_Item *it,
1243 1242
1244 wsd->reorder_item_changed = EINA_TRUE; 1243 wsd->reorder_item_changed = EINA_TRUE;
1245 wsd->move_effect_enabled = EINA_TRUE; 1244 wsd->move_effect_enabled = EINA_TRUE;
1246 if (wsd->calc_job) 1245 ecore_job_del(wsd->calc_job);
1247 ecore_job_del(wsd->calc_job);
1248 wsd->calc_job = 1246 wsd->calc_job =
1249 ecore_job_add(_calc_job, wsd->obj); 1247 ecore_job_add(_calc_job, wsd->obj);
1250 1248
@@ -2058,7 +2056,7 @@ _elm_gengrid_item_del_serious(Elm_Gen_Item *it)
2058 sd->group_items = eina_list_remove(sd->group_items, it); 2056 sd->group_items = eina_list_remove(sd->group_items, it);
2059 2057
2060 ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free); 2058 ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
2061 if (sd->calc_job) ecore_job_del(sd->calc_job); 2059 ecore_job_del(sd->calc_job);
2062 sd->calc_job = ecore_job_add(sd->calc_cb, sd->obj); 2060 sd->calc_job = ecore_job_add(sd->calc_cb, sd->obj);
2063 2061
2064 if (sd->last_selected_item == (Elm_Object_Item *)it) 2062 if (sd->last_selected_item == (Elm_Object_Item *)it)
@@ -2451,7 +2449,7 @@ _elm_gengrid_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2451 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 2449 ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
2452 ELM_SAFE_FREE(sd->stack, evas_object_del); 2450 ELM_SAFE_FREE(sd->stack, evas_object_del);
2453 2451
2454 if (sd->calc_job) ecore_job_del(sd->calc_job); 2452 ecore_job_del(sd->calc_job);
2455 2453
2456 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 2454 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
2457} 2455}
@@ -2555,7 +2553,7 @@ _item_size_set(Eo *obj, void *_pd, va_list *list)
2555 if ((sd->item_width == w) && (sd->item_height == h)) return; 2553 if ((sd->item_width == w) && (sd->item_height == h)) return;
2556 sd->item_width = w; 2554 sd->item_width = w;
2557 sd->item_height = h; 2555 sd->item_height = h;
2558 if (sd->calc_job) ecore_job_del(sd->calc_job); 2556 ecore_job_del(sd->calc_job);
2559 sd->calc_job = ecore_job_add(_calc_job, obj); 2557 sd->calc_job = ecore_job_add(_calc_job, obj);
2560} 2558}
2561 2559
@@ -2598,7 +2596,7 @@ _group_item_size_set(Eo *obj, void *_pd, va_list *list)
2598 if ((sd->group_item_width == w) && (sd->group_item_height == h)) return; 2596 if ((sd->group_item_width == w) && (sd->group_item_height == h)) return;
2599 sd->group_item_width = w; 2597 sd->group_item_width = w;
2600 sd->group_item_height = h; 2598 sd->group_item_height = h;
2601 if (sd->calc_job) ecore_job_del(sd->calc_job); 2599 ecore_job_del(sd->calc_job);
2602 sd->calc_job = ecore_job_add(_calc_job, obj); 2600 sd->calc_job = ecore_job_add(_calc_job, obj);
2603} 2601}
2604 2602
@@ -2715,7 +2713,7 @@ _item_append(Eo *obj, void *_pd, va_list *list)
2715 if (it->group) 2713 if (it->group)
2716 sd->group_items = eina_list_prepend(sd->group_items, it); 2714 sd->group_items = eina_list_prepend(sd->group_items, it);
2717 2715
2718 if (sd->calc_job) ecore_job_del(sd->calc_job); 2716 ecore_job_del(sd->calc_job);
2719 sd->calc_job = ecore_job_add(_calc_job, obj); 2717 sd->calc_job = ecore_job_add(_calc_job, obj);
2720 2718
2721 *ret = (Elm_Object_Item *)it; 2719 *ret = (Elm_Object_Item *)it;
@@ -2756,7 +2754,7 @@ _item_prepend(Eo *obj, void *_pd, va_list *list)
2756 if (it->group) 2754 if (it->group)
2757 sd->group_items = eina_list_append(sd->group_items, it); 2755 sd->group_items = eina_list_append(sd->group_items, it);
2758 2756
2759 if (sd->calc_job) ecore_job_del(sd->calc_job); 2757 ecore_job_del(sd->calc_job);
2760 sd->calc_job = ecore_job_add(_calc_job, obj); 2758 sd->calc_job = ecore_job_add(_calc_job, obj);
2761 2759
2762 *ret = (Elm_Object_Item *)it; 2760 *ret = (Elm_Object_Item *)it;
@@ -2804,7 +2802,7 @@ _item_insert_before(Eo *obj, void *_pd, va_list *list)
2804 sd->group_items = eina_list_append_relative 2802 sd->group_items = eina_list_append_relative
2805 (sd->group_items, it, ((Elm_Gen_Item *)relative)->parent); 2803 (sd->group_items, it, ((Elm_Gen_Item *)relative)->parent);
2806 2804
2807 if (sd->calc_job) ecore_job_del(sd->calc_job); 2805 ecore_job_del(sd->calc_job);
2808 sd->calc_job = ecore_job_add(_calc_job, obj); 2806 sd->calc_job = ecore_job_add(_calc_job, obj);
2809 2807
2810 *ret = (Elm_Object_Item *)it; 2808 *ret = (Elm_Object_Item *)it;
@@ -2852,7 +2850,7 @@ _item_insert_after(Eo *obj, void *_pd, va_list *list)
2852 sd->group_items = eina_list_prepend_relative 2850 sd->group_items = eina_list_prepend_relative
2853 (sd->group_items, it, ((Elm_Gen_Item *)relative)->parent); 2851 (sd->group_items, it, ((Elm_Gen_Item *)relative)->parent);
2854 2852
2855 if (sd->calc_job) ecore_job_del(sd->calc_job); 2853 ecore_job_del(sd->calc_job);
2856 sd->calc_job = ecore_job_add(_calc_job, obj); 2854 sd->calc_job = ecore_job_add(_calc_job, obj);
2857 2855
2858 *ret = (Elm_Object_Item *)it; 2856 *ret = (Elm_Object_Item *)it;
@@ -2900,7 +2898,7 @@ _item_sorted_insert(Eo *obj, void *_pd, va_list *list)
2900 (sd->items, EINA_INLIST_GET(it), _elm_gengrid_item_compare, sd->state); 2898 (sd->items, EINA_INLIST_GET(it), _elm_gengrid_item_compare, sd->state);
2901 _item_position_update(sd->items, 0); 2899 _item_position_update(sd->items, 0);
2902 2900
2903 if (sd->calc_job) ecore_job_del(sd->calc_job); 2901 ecore_job_del(sd->calc_job);
2904 sd->calc_job = ecore_job_add(_calc_job, obj); 2902 sd->calc_job = ecore_job_add(_calc_job, obj);
2905 2903
2906 *ret = (Elm_Object_Item *)it; 2904 *ret = (Elm_Object_Item *)it;
@@ -2925,7 +2923,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
2925 sd->horizontal = horizontal; 2923 sd->horizontal = horizontal;
2926 2924
2927 /* Update the items to conform to the new layout */ 2925 /* Update the items to conform to the new layout */
2928 if (sd->calc_job) ecore_job_del(sd->calc_job); 2926 ecore_job_del(sd->calc_job);
2929 sd->calc_job = ecore_job_add(_calc_job, obj); 2927 sd->calc_job = ecore_job_add(_calc_job, obj);
2930} 2928}
2931 2929
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index baaa95dfa..8b7cf6ada 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -199,8 +199,7 @@ _elm_genlist_pan_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
199{ 199{
200 Elm_Genlist_Pan_Smart_Data *psd = _pd; 200 Elm_Genlist_Pan_Smart_Data *psd = _pd;
201 201
202 if (psd->resize_job) 202 ecore_job_del(psd->resize_job);
203 ecore_job_del(psd->resize_job);
204 203
205 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_del()); 204 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_del());
206} 205}
@@ -240,13 +239,13 @@ _elm_genlist_pan_smart_resize(Eo *obj, void *_pd, va_list *list)
240 if ((psd->wsd->mode == ELM_LIST_COMPRESS) && (ow != w)) 239 if ((psd->wsd->mode == ELM_LIST_COMPRESS) && (ow != w))
241 { 240 {
242 /* fix me later */ 241 /* fix me later */
243 if (psd->resize_job) ecore_job_del(psd->resize_job); 242 ecore_job_del(psd->resize_job);
244 psd->resize_job = 243 psd->resize_job =
245 ecore_job_add(_elm_genlist_pan_smart_resize_job, obj); 244 ecore_job_add(_elm_genlist_pan_smart_resize_job, obj);
246 } 245 }
247 psd->wsd->pan_changed = EINA_TRUE; 246 psd->wsd->pan_changed = EINA_TRUE;
248 evas_object_smart_changed(obj); 247 evas_object_smart_changed(obj);
249 if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job); 248 ecore_job_del(psd->wsd->calc_job);
250 // if the width changed we may have to resize content if scrollbar went 249 // if the width changed we may have to resize content if scrollbar went
251 // away or appeared to queue a job to deal with it. it should settle in 250 // away or appeared to queue a job to deal with it. it should settle in
252 // the end to a steady-state 251 // the end to a steady-state
@@ -396,7 +395,7 @@ _must_recalc_idler(void *data)
396{ 395{
397 ELM_GENLIST_DATA_GET(data, sd); 396 ELM_GENLIST_DATA_GET(data, sd);
398 397
399 if (sd->calc_job) ecore_job_del(sd->calc_job); 398 ecore_job_del(sd->calc_job);
400 sd->calc_job = ecore_job_add(_calc_job, data); 399 sd->calc_job = ecore_job_add(_calc_job, data);
401 sd->must_recalc_idler = NULL; 400 sd->must_recalc_idler = NULL;
402 return ECORE_CALLBACK_CANCEL; 401 return ECORE_CALLBACK_CANCEL;
@@ -588,7 +587,7 @@ _elm_genlist_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
588 { 587 {
589 itb->must_recalc = EINA_TRUE; 588 itb->must_recalc = EINA_TRUE;
590 } 589 }
591 if (sd->calc_job) ecore_job_del(sd->calc_job); 590 ecore_job_del(sd->calc_job);
592 sd->calc_job = ecore_job_add(_calc_job, obj); 591 sd->calc_job = ecore_job_add(_calc_job, obj);
593 } 592 }
594 minw = vmw; 593 minw = vmw;
@@ -2193,7 +2192,7 @@ _elm_genlist_pan_smart_calculate(Eo *obj EINA_UNUSED, void *_pd, va_list *list E
2193 2192
2194 if (psd->wsd->pan_changed) 2193 if (psd->wsd->pan_changed)
2195 { 2194 {
2196 if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job); 2195 ecore_job_del(psd->wsd->calc_job);
2197 psd->wsd->calc_job = NULL; 2196 psd->wsd->calc_job = NULL;
2198 _calc_job(psd->wsd->obj); 2197 _calc_job(psd->wsd->obj);
2199 psd->wsd->pan_changed = EINA_FALSE; 2198 psd->wsd->pan_changed = EINA_FALSE;
@@ -2801,7 +2800,7 @@ _elm_genlist_smart_theme(Eo *obj, void *_pd, va_list *list)
2801 2800
2802 itb->changed = EINA_TRUE; 2801 itb->changed = EINA_TRUE;
2803 } 2802 }
2804 if (sd->calc_job) ecore_job_del(sd->calc_job); 2803 ecore_job_del(sd->calc_job);
2805 sd->calc_job = ecore_job_add(_calc_job, obj); 2804 sd->calc_job = ecore_job_add(_calc_job, obj);
2806 elm_layout_sizing_eval(obj); 2805 elm_layout_sizing_eval(obj);
2807 evas_event_thaw(evas_object_evas_get(obj)); 2806 evas_event_thaw(evas_object_evas_get(obj));
@@ -2951,7 +2950,7 @@ _item_block_del(Elm_Gen_Item *it)
2951 itb->items = eina_list_remove(itb->items, it); 2950 itb->items = eina_list_remove(itb->items, it);
2952 itb->count--; 2951 itb->count--;
2953 itb->changed = EINA_TRUE; 2952 itb->changed = EINA_TRUE;
2954 if (sd->calc_job) ecore_job_del(sd->calc_job); 2953 ecore_job_del(sd->calc_job);
2955 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 2954 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
2956 if (itb->count < 1) 2955 if (itb->count < 1)
2957 { 2956 {
@@ -3016,7 +3015,7 @@ _item_block_del(Elm_Gen_Item *it)
3016 { 3015 {
3017 sd->pan_changed = EINA_TRUE; 3016 sd->pan_changed = EINA_TRUE;
3018 evas_object_smart_changed(sd->pan_obj); 3017 evas_object_smart_changed(sd->pan_obj);
3019 if (sd->calc_job) ecore_job_del(sd->calc_job); 3018 ecore_job_del(sd->calc_job);
3020 sd->calc_job = NULL; 3019 sd->calc_job = NULL;
3021 } 3020 }
3022} 3021}
@@ -3091,7 +3090,7 @@ _elm_genlist_item_del_serious(Elm_Gen_Item *it)
3091 sd->group_items = eina_list_remove(sd->group_items, it); 3090 sd->group_items = eina_list_remove(sd->group_items, it);
3092 3091
3093 ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free); 3092 ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
3094 if (sd->calc_job) ecore_job_del(sd->calc_job); 3093 ecore_job_del(sd->calc_job);
3095 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 3094 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
3096 3095
3097 if (sd->last_selected_item == (Elm_Object_Item *)it) 3096 if (sd->last_selected_item == (Elm_Object_Item *)it)
@@ -3251,7 +3250,7 @@ _item_mouse_move_cb(void *data,
3251 else 3250 else
3252 _item_position(it, VIEW(it), it->item->scrl_x, y_pos); 3251 _item_position(it, VIEW(it), it->item->scrl_x, y_pos);
3253 3252
3254 if (sd->calc_job) ecore_job_del(sd->calc_job); 3253 ecore_job_del(sd->calc_job);
3255 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 3254 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
3256 } 3255 }
3257 return; 3256 return;
@@ -3577,7 +3576,7 @@ _item_mouse_down_cb(void *data,
3577 sd->prev_x = ev->canvas.x; 3576 sd->prev_x = ev->canvas.x;
3578 sd->prev_y = ev->canvas.y; 3577 sd->prev_y = ev->canvas.y;
3579 sd->multi_timeout = EINA_FALSE; 3578 sd->multi_timeout = EINA_FALSE;
3580 if (sd->multi_timer) ecore_timer_del(sd->multi_timer); 3579 ecore_timer_del(sd->multi_timer);
3581 sd->multi_timer = ecore_timer_add(MULTI_DOWN_TIME, _multi_cancel, sd->obj); 3580 sd->multi_timer = ecore_timer_add(MULTI_DOWN_TIME, _multi_cancel, sd->obj);
3582 } 3581 }
3583 sd->longpressed = EINA_FALSE; 3582 sd->longpressed = EINA_FALSE;
@@ -3594,7 +3593,7 @@ _item_mouse_down_cb(void *data,
3594 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it); 3593 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
3595 } 3594 }
3596 evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, it); 3595 evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, it);
3597 if (it->item->swipe_timer) ecore_timer_del(it->item->swipe_timer); 3596 ecore_timer_del(it->item->swipe_timer);
3598 it->item->swipe_timer = ecore_timer_add(SWIPE_TIME, _swipe_cancel, it); 3597 it->item->swipe_timer = ecore_timer_add(SWIPE_TIME, _swipe_cancel, it);
3599 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 3598 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
3600 if (it->realized) 3599 if (it->realized)
@@ -3803,7 +3802,7 @@ newblock:
3803 itb->count++; 3802 itb->count++;
3804 itb->changed = EINA_TRUE; 3803 itb->changed = EINA_TRUE;
3805 it->item->block = itb; 3804 it->item->block = itb;
3806 if (itb->sd->calc_job) ecore_job_del(itb->sd->calc_job); 3805 ecore_job_del(itb->sd->calc_job);
3807 itb->sd->calc_job = ecore_job_add(_calc_job, itb->sd->obj); 3806 itb->sd->calc_job = ecore_job_add(_calc_job, itb->sd->obj);
3808 3807
3809 if (itb->count > itb->sd->max_items_per_block) 3808 if (itb->count > itb->sd->max_items_per_block)
@@ -4002,7 +4001,7 @@ _item_idle_enterer(void *data)
4002 if (wakeup) 4001 if (wakeup)
4003 { 4002 {
4004 // wake up mainloop 4003 // wake up mainloop
4005 if (sd->calc_job) ecore_job_del(sd->calc_job); 4004 ecore_job_del(sd->calc_job);
4006 sd->calc_job = ecore_job_add(_calc_job, data); 4005 sd->calc_job = ecore_job_add(_calc_job, data);
4007 } 4006 }
4008 if (ok == ECORE_CALLBACK_CANCEL) sd->queue_idle_enterer = NULL; 4007 if (ok == ECORE_CALLBACK_CANCEL) sd->queue_idle_enterer = NULL;
@@ -4216,7 +4215,7 @@ _item_mouse_up_cb(void *data,
4216 } 4215 }
4217 else 4216 else
4218 { 4217 {
4219 if (sd->calc_job) ecore_job_del(sd->calc_job); 4218 ecore_job_del(sd->calc_job);
4220 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 4219 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
4221 } 4220 }
4222 edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm"); 4221 edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
@@ -4664,7 +4663,7 @@ _update_job(void *data)
4664 } 4663 }
4665 if (position) 4664 if (position)
4666 { 4665 {
4667 if (sd->calc_job) ecore_job_del(sd->calc_job); 4666 ecore_job_del(sd->calc_job);
4668 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 4667 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
4669 } 4668 }
4670 evas_event_thaw(evas_object_evas_get(sd->obj)); 4669 evas_event_thaw(evas_object_evas_get(sd->obj));
@@ -4997,14 +4996,14 @@ _elm_genlist_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4997 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 4996 ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
4998 4997
4999 _item_cache_zero(sd); 4998 _item_cache_zero(sd);
5000 if (sd->calc_job) ecore_job_del(sd->calc_job); 4999 ecore_job_del(sd->calc_job);
5001 if (sd->update_job) ecore_job_del(sd->update_job); 5000 ecore_job_del(sd->update_job);
5002 if (sd->queue_idle_enterer) ecore_idle_enterer_del(sd->queue_idle_enterer); 5001 ecore_idle_enterer_del(sd->queue_idle_enterer);
5003 if (sd->must_recalc_idler) ecore_idler_del(sd->must_recalc_idler); 5002 ecore_idler_del(sd->must_recalc_idler);
5004 if (sd->multi_timer) ecore_timer_del(sd->multi_timer); 5003 ecore_timer_del(sd->multi_timer);
5005 if (sd->scr_hold_timer) ecore_timer_del(sd->scr_hold_timer); 5004 ecore_timer_del(sd->scr_hold_timer);
5006 if (sd->decorate_it_type) eina_stringshare_del(sd->decorate_it_type); 5005 eina_stringshare_del(sd->decorate_it_type);
5007 if (sd->tree_effect_animator) ecore_animator_del(sd->tree_effect_animator); 5006 ecore_animator_del(sd->tree_effect_animator);
5008 5007
5009 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 5008 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
5010} 5009}
@@ -5323,7 +5322,7 @@ _item_del_pre_hook(Elm_Object_Item *item)
5323 { 5322 {
5324 if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE); 5323 if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE);
5325 it->item->block->changed = EINA_TRUE; 5324 it->item->block->changed = EINA_TRUE;
5326 if (sd->calc_job) ecore_job_del(sd->calc_job); 5325 ecore_job_del(sd->calc_job);
5327 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 5326 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
5328 } 5327 }
5329 if (it->parent) 5328 if (it->parent)
@@ -6481,7 +6480,7 @@ elm_genlist_item_update(Elm_Object_Item *item)
6481 it->item->mincalcd = EINA_FALSE; 6480 it->item->mincalcd = EINA_FALSE;
6482 it->item->updateme = EINA_TRUE; 6481 it->item->updateme = EINA_TRUE;
6483 it->item->block->updateme = EINA_TRUE; 6482 it->item->block->updateme = EINA_TRUE;
6484 if (sd->update_job) ecore_job_del(sd->update_job); 6483 ecore_job_del(sd->update_job);
6485 sd->update_job = ecore_job_add(_update_job, sd->obj); 6484 sd->update_job = ecore_job_add(_update_job, sd->obj);
6486} 6485}
6487 6486
@@ -7213,7 +7212,7 @@ _decorate_mode_set(Eo *obj, void *_pd, va_list *valist)
7213 } 7212 }
7214 } 7213 }
7215 7214
7216 if (sd->calc_job) ecore_job_del(sd->calc_job); 7215 ecore_job_del(sd->calc_job);
7217 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 7216 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
7218} 7217}
7219 7218
@@ -7345,7 +7344,7 @@ _flip_job(void *data)
7345 7344
7346 it->flipped = EINA_TRUE; 7345 it->flipped = EINA_TRUE;
7347 it->item->nocache = EINA_TRUE; 7346 it->item->nocache = EINA_TRUE;
7348 if (sd->calc_job) ecore_job_del(sd->calc_job); 7347 ecore_job_del(sd->calc_job);
7349 sd->calc_job = ecore_job_add(_calc_job, sd->obj); 7348 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
7350} 7349}
7351 7350
@@ -7477,7 +7476,7 @@ elm_genlist_item_select_mode_set(Elm_Object_Item *item,
7477 it->item->mincalcd = EINA_FALSE; 7476 it->item->mincalcd = EINA_FALSE;
7478 it->item->updateme = EINA_TRUE; 7477 it->item->updateme = EINA_TRUE;
7479 if (it->item->block) it->item->block->updateme = EINA_TRUE; 7478 if (it->item->block) it->item->block->updateme = EINA_TRUE;
7480 if (sd->update_job) ecore_job_del(sd->update_job); 7479 ecore_job_del(sd->update_job);
7481 sd->update_job = ecore_job_add(_update_job, sd->obj); 7480 sd->update_job = ecore_job_add(_update_job, sd->obj);
7482 7481
7483 // reset homogeneous item size 7482 // reset homogeneous item size
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 63bbb0628..78fe6004b 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3799,7 +3799,7 @@ _elm_gesture_layer_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
3799 free(sd->gesture[i]); 3799 free(sd->gesture[i]);
3800 sd->gesture[i] = NULL; /* Referenced by _event_history_clear */ 3800 sd->gesture[i] = NULL; /* Referenced by _event_history_clear */
3801 } 3801 }
3802 if (sd->gest_taps_timeout) ecore_timer_del(sd->gest_taps_timeout); 3802 ecore_timer_del(sd->gest_taps_timeout);
3803 3803
3804 /* Then take care of clearing events */ 3804 /* Then take care of clearing events */
3805 _event_history_clear(obj); 3805 _event_history_clear(obj);
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 3a3c4ebb0..c669ea2be 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -493,9 +493,9 @@ _elm_image_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
493{ 493{
494 Elm_Image_Smart_Data *sd = _pd; 494 Elm_Image_Smart_Data *sd = _pd;
495 495
496 if (sd->anim_timer) ecore_timer_del(sd->anim_timer); 496 ecore_timer_del(sd->anim_timer);
497 if (sd->img) evas_object_del(sd->img); 497 evas_object_del(sd->img);
498 if (sd->prev_img) evas_object_del(sd->prev_img); 498 evas_object_del(sd->prev_img);
499 if (sd->remote) elm_url_cancel(sd->remote); 499 if (sd->remote) elm_url_cancel(sd->remote);
500 free(sd->remote_data); 500 free(sd->remote_data);
501 eina_stringshare_del(sd->key); 501 eina_stringshare_del(sd->key);
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 14a32f389..eaaa51030 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -643,7 +643,7 @@ _sel_eval(Evas_Object *obj,
643 else 643 else
644 evas_object_smart_callback_call 644 evas_object_smart_callback_call
645 (obj, SIG_CHANGED, it); 645 (obj, SIG_CHANGED, it);
646 if (sd->delay) ecore_timer_del(sd->delay); 646 ecore_timer_del(sd->delay);
647 sd->delay = ecore_timer_add(sd->delay_change_time, 647 sd->delay = ecore_timer_add(sd->delay_change_time,
648 _delay_change_cb, obj); 648 _delay_change_cb, obj);
649 } 649 }
@@ -975,7 +975,7 @@ _elm_index_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
975 EINA_LIST_FREE(sd->omit, o) 975 EINA_LIST_FREE(sd->omit, o)
976 free(o); 976 free(o);
977 977
978 if (sd->delay) ecore_timer_del(sd->delay); 978 ecore_timer_del(sd->delay);
979 979
980 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 980 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
981} 981}
@@ -1230,7 +1230,7 @@ elm_index_item_selected_set(Elm_Object_Item *it,
1230 (obj, SIG_CHANGED, it); 1230 (obj, SIG_CHANGED, it);
1231 evas_object_smart_callback_call 1231 evas_object_smart_callback_call
1232 (obj, SIG_SELECTED, it); 1232 (obj, SIG_SELECTED, it);
1233 if (sd->delay) ecore_timer_del(sd->delay); 1233 ecore_timer_del(sd->delay);
1234 sd->delay = ecore_timer_add(sd->delay_change_time, 1234 sd->delay = ecore_timer_add(sd->delay_change_time,
1235 _delay_change_cb, obj); 1235 _delay_change_cb, obj);
1236 } 1236 }
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 2da13af34..046ad63d3 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -4643,14 +4643,14 @@ _elm_scroll_interface_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4643 eo_do(obj, elm_scrollable_interface_content_set(NULL)); 4643 eo_do(obj, elm_scrollable_interface_content_set(NULL));
4644 if (!sid->extern_pan) evas_object_del(sid->pan_obj); 4644 if (!sid->extern_pan) evas_object_del(sid->pan_obj);
4645 4645
4646 if (sid->down.hold_enterer) ecore_idle_enterer_del(sid->down.hold_enterer); 4646 ecore_idle_enterer_del(sid->down.hold_enterer);
4647 if (sid->down.hold_animator) ecore_animator_del(sid->down.hold_animator); 4647 ecore_animator_del(sid->down.hold_animator);
4648 if (sid->down.onhold_animator) ecore_animator_del(sid->down.onhold_animator); 4648 ecore_animator_del(sid->down.onhold_animator);
4649 if (sid->down.momentum_animator) ecore_animator_del(sid->down.momentum_animator); 4649 ecore_animator_del(sid->down.momentum_animator);
4650 if (sid->down.bounce_x_animator) ecore_animator_del(sid->down.bounce_x_animator); 4650 ecore_animator_del(sid->down.bounce_x_animator);
4651 if (sid->down.bounce_y_animator) ecore_animator_del(sid->down.bounce_y_animator); 4651 ecore_animator_del(sid->down.bounce_y_animator);
4652 if (sid->scrollto.x.animator) ecore_animator_del(sid->scrollto.x.animator); 4652 ecore_animator_del(sid->scrollto.x.animator);
4653 if (sid->scrollto.y.animator) ecore_animator_del(sid->scrollto.y.animator); 4653 ecore_animator_del(sid->scrollto.y.animator);
4654} 4654}
4655 4655
4656static void 4656static void
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4772233a8..8ca8825c3 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1235,10 +1235,10 @@ _mouse_down_cb(void *data,
1235 1235
1236 _item_highlight(it); 1236 _item_highlight(it);
1237 sd->longpressed = EINA_FALSE; 1237 sd->longpressed = EINA_FALSE;
1238 if (it->long_timer) ecore_timer_del(it->long_timer); 1238 ecore_timer_del(it->long_timer);
1239 it->long_timer = ecore_timer_add 1239 it->long_timer = ecore_timer_add
1240 (_elm_config->longpress_timeout, _long_press_cb, it); 1240 (_elm_config->longpress_timeout, _long_press_cb, it);
1241 if (it->swipe_timer) ecore_timer_del(it->swipe_timer); 1241 ecore_timer_del(it->swipe_timer);
1242 it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it); 1242 it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
1243 1243
1244 /* Always call the callbacks last - the user may delete our context! */ 1244 /* Always call the callbacks last - the user may delete our context! */
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 690e1448a..4064f0a3a 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -627,7 +627,7 @@ _grid_item_update(Grid_Item *gi)
627 gi->file_have = EINA_TRUE; 627 gi->file_have = EINA_TRUE;
628 } 628 }
629 629
630 if (gi->wsd->loaded_timer) ecore_timer_del(gi->wsd->loaded_timer); 630 ecore_timer_del(gi->wsd->loaded_timer);
631 gi->wsd->loaded_timer = ecore_timer_add(0.25, _loaded_timeout_cb, gi->wsd->obj); 631 gi->wsd->loaded_timer = ecore_timer_add(0.25, _loaded_timeout_cb, gi->wsd->obj);
632} 632}
633 633
@@ -1161,7 +1161,7 @@ _zoom_with_animation(Elm_Map_Smart_Data *sd,
1161 sd->ani.cnt = cnt; 1161 sd->ani.cnt = cnt;
1162 sd->ani.zoom = sd->zoom; 1162 sd->ani.zoom = sd->zoom;
1163 sd->ani.diff = (double)(zoom - sd->zoom) / cnt; 1163 sd->ani.diff = (double)(zoom - sd->zoom) / cnt;
1164 if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator); 1164 ecore_animator_del(sd->zoom_animator);
1165 sd->zoom_animator = ecore_animator_add(_zoom_anim_cb, sd->obj); 1165 sd->zoom_animator = ecore_animator_add(_zoom_anim_cb, sd->obj);
1166} 1166}
1167 1167
@@ -1262,7 +1262,7 @@ _mouse_down_cb(void *data,
1262 evas_object_smart_callback_call 1262 evas_object_smart_callback_call
1263 (sd->obj, SIG_PRESS, ev); 1263 (sd->obj, SIG_PRESS, ev);
1264 1264
1265 if (sd->long_timer) ecore_timer_del(sd->long_timer); 1265 ecore_timer_del(sd->long_timer);
1266 sd->ev = *ev; 1266 sd->ev = *ev;
1267 sd->long_timer = 1267 sd->long_timer =
1268 ecore_timer_add(_elm_config->longpress_timeout, _long_press_cb, data); 1268 ecore_timer_add(_elm_config->longpress_timeout, _long_press_cb, data);
@@ -4081,12 +4081,12 @@ _elm_map_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4081 EINA_LIST_FREE(sd->track, track) 4081 EINA_LIST_FREE(sd->track, track)
4082 evas_object_del(track); 4082 evas_object_del(track);
4083 4083
4084 if (sd->scr_timer) ecore_timer_del(sd->scr_timer); 4084 ecore_timer_del(sd->scr_timer);
4085 if (sd->long_timer) ecore_timer_del(sd->long_timer); 4085 ecore_timer_del(sd->long_timer);
4086 if (sd->user_agent) eina_stringshare_del(sd->user_agent); 4086 eina_stringshare_del(sd->user_agent);
4087 if (sd->ua) eina_hash_free(sd->ua); 4087 eina_hash_free(sd->ua);
4088 if (sd->zoom_timer) ecore_timer_del(sd->zoom_timer); 4088 ecore_timer_del(sd->zoom_timer);
4089 if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator); 4089 ecore_animator_del(sd->zoom_animator);
4090 4090
4091 _grid_all_clear(sd); 4091 _grid_all_clear(sd);
4092 // Removal of download list should be after grid clear. 4092 // Removal of download list should be after grid clear.
@@ -4103,7 +4103,7 @@ _elm_map_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4103 ERR("Deletion of %s failed", buf); 4103 ERR("Deletion of %s failed", buf);
4104 } 4104 }
4105 4105
4106 if (sd->loaded_timer) ecore_timer_del(sd->loaded_timer); 4106 ecore_timer_del(sd->loaded_timer);
4107 if (sd->map) evas_map_free(sd->map); 4107 if (sd->map) evas_map_free(sd->map);
4108 4108
4109 eo_unref(sd->pan_obj); 4109 eo_unref(sd->pan_obj);
@@ -4426,7 +4426,7 @@ _paused_set(Eo *obj, void *_pd, va_list *list)
4426 { 4426 {
4427 if (sd->zoom_animator) 4427 if (sd->zoom_animator)
4428 { 4428 {
4429 if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator); 4429 ecore_animator_del(sd->zoom_animator);
4430 sd->zoom_animator = NULL; 4430 sd->zoom_animator = NULL;
4431 _zoom_do(sd, sd->zoom); 4431 _zoom_do(sd, sd->zoom);
4432 } 4432 }
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 86c6b5ebc..def1d6c4d 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -270,7 +270,7 @@ static void
270_timer_init(Evas_Object *obj, 270_timer_init(Evas_Object *obj,
271 Elm_Notify_Smart_Data *sd) 271 Elm_Notify_Smart_Data *sd)
272{ 272{
273 if (sd->timer) ecore_timer_del(sd->timer); 273 ecore_timer_del(sd->timer);
274 if (sd->timeout > 0.0) 274 if (sd->timeout > 0.0)
275 sd->timer = ecore_timer_add(sd->timeout, _timer_cb, obj); 275 sd->timer = ecore_timer_add(sd->timeout, _timer_cb, obj);
276 else 276 else
@@ -502,7 +502,7 @@ _elm_notify_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
502 (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj); 502 (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj);
503 elm_notify_parent_set(obj, NULL); 503 elm_notify_parent_set(obj, NULL);
504 elm_notify_allow_events_set(obj, EINA_FALSE); 504 elm_notify_allow_events_set(obj, EINA_FALSE);
505 if (sd->timer) ecore_timer_del(sd->timer); 505 ecore_timer_del(sd->timer);
506 506
507 ELM_SAFE_FREE(sd->notify, evas_object_del); 507 ELM_SAFE_FREE(sd->notify, evas_object_del);
508 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 508 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index b340bd111..c6e590d4c 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -195,7 +195,7 @@ _mouse_down(void *data,
195 195
196 if (ev->button != 1) return; 196 if (ev->button != 1) return;
197 197
198 if (sd->long_press_timer) ecore_timer_del(sd->long_press_timer); 198 ecore_timer_del(sd->long_press_timer);
199 sd->long_press_timer = ecore_timer_add(_elm_config->longpress_timeout, 199 sd->long_press_timer = ecore_timer_add(_elm_config->longpress_timeout,
200 _long_press_cb, data); 200 _long_press_cb, data);
201 evas_object_event_callback_add 201 evas_object_event_callback_add
@@ -303,7 +303,7 @@ _elm_photo_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
303{ 303{
304 Elm_Photo_Smart_Data * sd = _pd; 304 Elm_Photo_Smart_Data * sd = _pd;
305 305
306 if (sd->long_press_timer) ecore_timer_del(sd->long_press_timer); 306 ecore_timer_del(sd->long_press_timer);
307 307
308 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 308 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
309} 309}
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index ce192f3f6..bde52adb1 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -136,7 +136,7 @@ _elm_photocam_pan_smart_move(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
136 va_arg(*list, Evas_Coord); 136 va_arg(*list, Evas_Coord);
137 va_arg(*list, Evas_Coord); 137 va_arg(*list, Evas_Coord);
138 138
139 if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job); 139 ecore_job_del(psd->wsd->calc_job);
140 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); 140 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
141} 141}
142 142
@@ -153,7 +153,7 @@ _elm_photocam_pan_smart_resize(Eo *obj, void *_pd, va_list *list)
153 if ((ow == w) && (oh == h)) return; 153 if ((ow == w) && (oh == h)) return;
154 154
155 psd->wsd->resized = EINA_TRUE; 155 psd->wsd->resized = EINA_TRUE;
156 if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job); 156 ecore_job_del(psd->wsd->calc_job);
157 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); 157 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
158} 158}
159 159
@@ -734,7 +734,7 @@ _main_img_preloaded_cb(void *data,
734 sd->grids = eina_list_prepend(sd->grids, g); 734 sd->grids = eina_list_prepend(sd->grids, g);
735 _grid_load(obj, g); 735 _grid_load(obj, g);
736 } 736 }
737 if (sd->calc_job) ecore_job_del(sd->calc_job); 737 ecore_job_del(sd->calc_job);
738 sd->calc_job = ecore_job_add(_calc_job_cb, data); 738 sd->calc_job = ecore_job_add(_calc_job_cb, data);
739 evas_object_smart_callback_call(data, SIG_LOADED, NULL); 739 evas_object_smart_callback_call(data, SIG_LOADED, NULL);
740 sd->preload_num--; 740 sd->preload_num--;
@@ -772,7 +772,7 @@ _zoom_do(Evas_Object *obj,
772 sd->show.w = ow; 772 sd->show.w = ow;
773 sd->show.h = oh; 773 sd->show.h = oh;
774 774
775 if (sd->calc_job) ecore_job_del(sd->calc_job); 775 ecore_job_del(sd->calc_job);
776 sd->calc_job = ecore_job_add(_calc_job_cb, obj); 776 sd->calc_job = ecore_job_add(_calc_job_cb, obj);
777 if (t >= 1.0) 777 if (t >= 1.0)
778 { 778 {
@@ -854,7 +854,7 @@ _mouse_down_cb(void *data,
854 else 854 else
855 evas_object_smart_callback_call(data, SIG_PRESS, NULL); 855 evas_object_smart_callback_call(data, SIG_PRESS, NULL);
856 sd->longpressed = EINA_FALSE; 856 sd->longpressed = EINA_FALSE;
857 if (sd->long_timer) ecore_timer_del(sd->long_timer); 857 ecore_timer_del(sd->long_timer);
858 sd->long_timer = ecore_timer_add 858 sd->long_timer = ecore_timer_add
859 (_elm_config->longpress_timeout, _long_press_cb, data); 859 (_elm_config->longpress_timeout, _long_press_cb, data);
860} 860}
@@ -959,7 +959,7 @@ _scroll_cb(Evas_Object *obj,
959 if (sd->no_smooth == 1) _smooth_update(obj); 959 if (sd->no_smooth == 1) _smooth_update(obj);
960 } 960 }
961 961
962 if (sd->scr_timer) ecore_timer_del(sd->scr_timer); 962 ecore_timer_del(sd->scr_timer);
963 sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj); 963 sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
964 964
965 evas_object_smart_callback_call(obj, SIG_SCROLL, NULL); 965 evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
@@ -1414,13 +1414,12 @@ _elm_photocam_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1414 if (sd->f) eina_file_close(sd->f); 1414 if (sd->f) eina_file_close(sd->f);
1415 free(sd->remote_data); 1415 free(sd->remote_data);
1416 if (sd->remote) elm_url_cancel(sd->remote); 1416 if (sd->remote) elm_url_cancel(sd->remote);
1417 if (sd->file) eina_stringshare_del(sd->file); 1417 eina_stringshare_del(sd->file);
1418 if (sd->calc_job) ecore_job_del(sd->calc_job); 1418 ecore_job_del(sd->calc_job);
1419 if (sd->scr_timer) ecore_timer_del(sd->scr_timer); 1419 ecore_timer_del(sd->scr_timer);
1420 if (sd->long_timer) ecore_timer_del(sd->long_timer); 1420 ecore_timer_del(sd->long_timer);
1421 if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator); 1421 ecore_animator_del(sd->zoom_animator);
1422 if (sd->g_layer_zoom.bounce.animator) 1422 ecore_animator_del(sd->g_layer_zoom.bounce.animator);
1423 ecore_animator_del(sd->g_layer_zoom.bounce.animator);
1424 1423
1425 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 1424 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
1426} 1425}
@@ -1629,7 +1628,7 @@ _file_set(Eo *obj, void *_pd, va_list *list)
1629 ecore_animator_del(sd->zoom_animator); 1628 ecore_animator_del(sd->zoom_animator);
1630 sd->zoom_animator = NULL; 1629 sd->zoom_animator = NULL;
1631 } 1630 }
1632 if (sd->calc_job) ecore_job_del(sd->calc_job); 1631 ecore_job_del(sd->calc_job);
1633 evas_object_hide(sd->img); 1632 evas_object_hide(sd->img);
1634 if (sd->f) eina_file_close(sd->f); 1633 if (sd->f) eina_file_close(sd->f);
1635 sd->f = NULL; 1634 sd->f = NULL;
@@ -1895,7 +1894,7 @@ done:
1895 } 1894 }
1896 } 1895 }
1897 1896
1898 if (sd->calc_job) ecore_job_del(sd->calc_job); 1897 ecore_job_del(sd->calc_job);
1899 sd->calc_job = ecore_job_add(_calc_job_cb, obj); 1898 sd->calc_job = ecore_job_add(_calc_job_cb, obj);
1900 if (!sd->paused) 1899 if (!sd->paused)
1901 { 1900 {
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 4d567517b..f529e5814 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -84,7 +84,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
84 if (user_event) 84 if (user_event)
85 { 85 {
86 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 86 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
87 if (sd->delay) ecore_timer_del(sd->delay); 87 ecore_timer_del(sd->delay);
88 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); 88 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
89 } 89 }
90 } 90 }
@@ -905,10 +905,10 @@ _elm_slider_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
905{ 905{
906 Elm_Slider_Smart_Data *sd = _pd; 906 Elm_Slider_Smart_Data *sd = _pd;
907 907
908 if (sd->indicator) eina_stringshare_del(sd->indicator); 908 eina_stringshare_del(sd->indicator);
909 if (sd->units) eina_stringshare_del(sd->units); 909 eina_stringshare_del(sd->units);
910 if (sd->delay) ecore_timer_del(sd->delay); 910 ecore_timer_del(sd->delay);
911 if (sd->popup) evas_object_del(sd->popup); 911 evas_object_del(sd->popup);
912 912
913 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 913 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
914} 914}
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 2220f974c..dcdf5f557 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -356,7 +356,7 @@ _elm_slideshow_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
356 356
357 elm_slideshow_clear(obj); 357 elm_slideshow_clear(obj);
358 if (sd->transitions) elm_widget_stringlist_free(sd->transitions); 358 if (sd->transitions) elm_widget_stringlist_free(sd->transitions);
359 if (sd->timer) ecore_timer_del(sd->timer); 359 ecore_timer_del(sd->timer);
360 360
361 EINA_LIST_FREE(sd->layout.list, layout) 361 EINA_LIST_FREE(sd->layout.list, layout)
362 eina_stringshare_del(layout); 362 eina_stringshare_del(layout);
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 9fb3c7ebb..50cde2327 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -153,7 +153,7 @@ _value_set(Evas_Object *obj,
153 sd->val = new_val; 153 sd->val = new_val;
154 154
155 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 155 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
156 if (sd->delay_timer) ecore_timer_del(sd->delay_timer); 156 ecore_timer_del(sd->delay_timer);
157 sd->delay_timer = ecore_timer_add(0.2, _delay_change, obj); 157 sd->delay_timer = ecore_timer_add(0.2, _delay_change, obj);
158 158
159 return EINA_TRUE; 159 return EINA_TRUE;
@@ -266,7 +266,7 @@ _entry_activated_cb(void *data,
266 266
267 _entry_value_apply(data); 267 _entry_value_apply(data);
268 evas_object_smart_callback_call(data, SIG_CHANGED, NULL); 268 evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
269 if (sd->delay_timer) ecore_timer_del(sd->delay_timer); 269 ecore_timer_del(sd->delay_timer);
270 sd->delay_timer = ecore_timer_add(0.2, _delay_change, data); 270 sd->delay_timer = ecore_timer_add(0.2, _delay_change, data);
271} 271}
272 272
@@ -335,7 +335,7 @@ _val_inc_start(Evas_Object *obj)
335 335
336 sd->interval = sd->first_interval; 336 sd->interval = sd->first_interval;
337 sd->spin_speed = sd->step; 337 sd->spin_speed = sd->step;
338 if (sd->spin_timer) ecore_timer_del(sd->spin_timer); 338 ecore_timer_del(sd->spin_timer);
339 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, obj); 339 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, obj);
340 _spin_value(obj); 340 _spin_value(obj);
341} 341}
@@ -357,7 +357,7 @@ _val_dec_start(Evas_Object *obj)
357 357
358 sd->interval = sd->first_interval; 358 sd->interval = sd->first_interval;
359 sd->spin_speed = -sd->step; 359 sd->spin_speed = -sd->step;
360 if (sd->spin_timer) ecore_timer_del(sd->spin_timer); 360 ecore_timer_del(sd->spin_timer);
361 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, obj); 361 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, obj);
362 _spin_value(obj); 362 _spin_value(obj);
363} 363}
@@ -739,9 +739,9 @@ _elm_spinner_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
739 739
740 Elm_Spinner_Smart_Data *sd = _pd; 740 Elm_Spinner_Smart_Data *sd = _pd;
741 741
742 if (sd->label) eina_stringshare_del(sd->label); 742 eina_stringshare_del(sd->label);
743 if (sd->delay_timer) ecore_timer_del(sd->delay_timer); 743 ecore_timer_del(sd->delay_timer);
744 if (sd->spin_timer) ecore_timer_del(sd->spin_timer); 744 ecore_timer_del(sd->spin_timer);
745 745
746 if (sd->special_values) 746 if (sd->special_values)
747 { 747 {
diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index 2fbc0f9f3..c96049b74 100644
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -232,7 +232,7 @@ _store_genlist_item_realized(void *data, Evas_Object *obj EINA_UNUSED, void *eve
232 if (!sti) return; 232 if (!sti) return;
233 st->realized_count++; 233 st->realized_count++;
234 sti->live = EINA_TRUE; 234 sti->live = EINA_TRUE;
235 if (sti->eval_job) ecore_job_del(sti->eval_job); 235 ecore_job_del(sti->eval_job);
236 sti->eval_job = ecore_job_add(_store_item_eval, sti); 236 sti->eval_job = ecore_job_add(_store_item_eval, sti);
237} 237}
238 238
@@ -245,7 +245,7 @@ _store_genlist_item_unrealized(void *data, Evas_Object *obj EINA_UNUSED, void *e
245 if (!sti) return; 245 if (!sti) return;
246 st->realized_count--; 246 st->realized_count--;
247 sti->live = EINA_FALSE; 247 sti->live = EINA_FALSE;
248 if (sti->eval_job) ecore_job_del(sti->eval_job); 248 ecore_job_del(sti->eval_job);
249 sti->eval_job = ecore_job_add(_store_item_eval, sti); 249 sti->eval_job = ecore_job_add(_store_item_eval, sti);
250} 250}
251 251
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 4cd9e6efb..8c37d3bbd 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -737,7 +737,7 @@ _resize_cb(void *data,
737 evas_object_geometry_get(data, &x, &y, NULL, &h); 737 evas_object_geometry_get(data, &x, &y, NULL, &h);
738 evas_object_move(sd->more, x, y + h); 738 evas_object_move(sd->more, x, y + h);
739 739
740 if (sd->resize_job) ecore_job_del(sd->resize_job); 740 ecore_job_del(sd->resize_job);
741 sd->resize_job = ecore_job_add(_resize_job, data); 741 sd->resize_job = ecore_job_add(_resize_job, data);
742} 742}
743 743
@@ -2586,9 +2586,7 @@ _elm_toolbar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2586 2586
2587 sd->delete_me = EINA_TRUE; 2587 sd->delete_me = EINA_TRUE;
2588 2588
2589 if (sd->resize_job) 2589 ecore_job_del(sd->resize_job);
2590 ecore_job_del(sd->resize_job);
2591
2592 sd->resize_job = NULL; 2590 sd->resize_job = NULL;
2593 2591
2594 it = ELM_TOOLBAR_ITEM_FROM_INLIST(sd->items); 2592 it = ELM_TOOLBAR_ITEM_FROM_INLIST(sd->items);
@@ -2599,7 +2597,7 @@ _elm_toolbar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2599 it = next; 2597 it = next;
2600 } 2598 }
2601 if (sd->more_item) elm_widget_item_del(sd->more_item); 2599 if (sd->more_item) elm_widget_item_del(sd->more_item);
2602 if (sd->long_timer) ecore_timer_del(sd->long_timer); 2600 ecore_timer_del(sd->long_timer);
2603 2601
2604 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 2602 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
2605} 2603}
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 74df5e087..491e3e5ab 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -254,7 +254,7 @@ _elm_video_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
254{ 254{
255 Elm_Video_Smart_Data *sd = _pd; 255 Elm_Video_Smart_Data *sd = _pd;
256 256
257 if (sd->timer) ecore_timer_del(sd->timer); 257 ecore_timer_del(sd->timer);
258 if (sd->remember) emotion_object_last_position_save(sd->emotion); 258 if (sd->remember) emotion_object_last_position_save(sd->emotion);
259 259
260 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 260 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 53087b028..4ff13a10b 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -259,7 +259,7 @@ _view_smart_del(Evas_Object *obj)
259 259
260 sd = evas_object_smart_data_get(obj); 260 sd = evas_object_smart_data_get(obj);
261 261
262 if (sd->mouse.pan_anim) ecore_animator_del(sd->mouse.pan_anim); 262 ecore_animator_del(sd->mouse.pan_anim);
263 263
264 _ewk_view_parent_sc.sc.del(obj); 264 _ewk_view_parent_sc.sc.del(obj);
265} 265}
@@ -911,7 +911,7 @@ _ewk_view_resized_cb(void *data,
911 if (!(sd->zoom.mode != ELM_WEB_ZOOM_MODE_MANUAL)) 911 if (!(sd->zoom.mode != ELM_WEB_ZOOM_MODE_MANUAL))
912 return; 912 return;
913 913
914 if (sd->zoom.timer) ecore_timer_del(sd->zoom.timer); 914 ecore_timer_del(sd->zoom.timer);
915 sd->zoom.timer = ecore_timer_add(0.5, _reset_zoom_timer_cb, data); 915 sd->zoom.timer = ecore_timer_add(0.5, _reset_zoom_timer_cb, data);
916} 916}
917 917
@@ -1205,8 +1205,8 @@ _elm_web_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1205#ifdef HAVE_ELEMENTARY_WEB 1205#ifdef HAVE_ELEMENTARY_WEB
1206 Elm_Web_Smart_Data *sd = _pd; 1206 Elm_Web_Smart_Data *sd = _pd;
1207 1207
1208 if (sd->zoom.timer) ecore_timer_del(sd->zoom.timer); 1208 ecore_timer_del(sd->zoom.timer);
1209 if (sd->bring_in.animator) ecore_animator_del(sd->bring_in.animator); 1209 ecore_animator_del(sd->bring_in.animator);
1210 1210
1211#else 1211#else
1212 (void)_pd; 1212 (void)_pd;
@@ -2758,7 +2758,7 @@ _region_bring_in(Eo *obj, void *_pd, va_list *list)
2758 sd->bring_in.start.y = sy; 2758 sd->bring_in.start.y = sy;
2759 sd->bring_in.end.x = rx; 2759 sd->bring_in.end.x = rx;
2760 sd->bring_in.end.y = ry; 2760 sd->bring_in.end.y = ry;
2761 if (sd->bring_in.animator) ecore_animator_del(sd->bring_in.animator); 2761 ecore_animator_del(sd->bring_in.animator);
2762 sd->bring_in.animator = ecore_animator_timeline_add( 2762 sd->bring_in.animator = ecore_animator_timeline_add(
2763 _elm_config->bring_in_scroll_friction, _bring_in_anim_cb, obj); 2763 _elm_config->bring_in_scroll_friction, _bring_in_anim_cb, obj);
2764#else 2764#else
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 19d64904f..2e493242b 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -339,7 +339,7 @@ _elm_win_state_eval(void *data EINA_UNUSED)
339static void 339static void
340_elm_win_state_eval_queue(void) 340_elm_win_state_eval_queue(void)
341{ 341{
342 if (_elm_win_state_eval_job) ecore_job_del(_elm_win_state_eval_job); 342 ecore_job_del(_elm_win_state_eval_job);
343 _elm_win_state_eval_job = ecore_job_add(_elm_win_state_eval, NULL); 343 _elm_win_state_eval_job = ecore_job_add(_elm_win_state_eval, NULL);
344} 344}
345 345
@@ -644,7 +644,7 @@ _elm_win_resize(Ecore_Evas *ee)
644 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee); 644 Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
645 EINA_SAFETY_ON_NULL_RETURN(sd); 645 EINA_SAFETY_ON_NULL_RETURN(sd);
646 646
647 if (sd->deferred_resize_job) ecore_job_del(sd->deferred_resize_job); 647 ecore_job_del(sd->deferred_resize_job);
648 sd->deferred_resize_job = ecore_job_add(_elm_win_resize_job, sd->obj); 648 sd->deferred_resize_job = ecore_job_add(_elm_win_resize_job, sd->obj);
649} 649}
650 650
@@ -812,8 +812,7 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
812static void 812static void
813_elm_win_focus_highlight_reconfigure_job_start(Elm_Win_Smart_Data *sd) 813_elm_win_focus_highlight_reconfigure_job_start(Elm_Win_Smart_Data *sd)
814{ 814{
815 if (sd->focus_highlight.reconf_job) 815 ecore_job_del(sd->focus_highlight.reconf_job);
816 ecore_job_del(sd->focus_highlight.reconf_job);
817 816
818 sd->focus_highlight.reconf_job = ecore_job_add( 817 sd->focus_highlight.reconf_job = ecore_job_add(
819 _elm_win_focus_highlight_reconfigure_job, sd->obj); 818 _elm_win_focus_highlight_reconfigure_job, sd->obj);
@@ -1467,16 +1466,14 @@ _elm_win_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1467 ecore_evas_callback_resize_set(sd->ee, NULL); 1466 ecore_evas_callback_resize_set(sd->ee, NULL);
1468 } 1467 }
1469 1468
1470 if (sd->deferred_resize_job) ecore_job_del(sd->deferred_resize_job); 1469 ecore_job_del(sd->deferred_resize_job);
1471 if (sd->deferred_child_eval_job) ecore_job_del(sd->deferred_child_eval_job); 1470 ecore_job_del(sd->deferred_child_eval_job);
1472 if (sd->shot.info) eina_stringshare_del(sd->shot.info); 1471 eina_stringshare_del(sd->shot.info);
1473 if (sd->shot.timer) ecore_timer_del(sd->shot.timer); 1472 ecore_timer_del(sd->shot.timer);
1474 1473
1475#ifdef HAVE_ELEMENTARY_X 1474#ifdef HAVE_ELEMENTARY_X
1476 if (sd->x.client_message_handler) 1475 ecore_event_handler_del(sd->x.client_message_handler);
1477 ecore_event_handler_del(sd->x.client_message_handler); 1476 ecore_event_handler_del(sd->x.property_handler);
1478 if (sd->x.property_handler)
1479 ecore_event_handler_del(sd->x.property_handler);
1480#endif 1477#endif
1481 1478
1482 if (sd->img_obj) 1479 if (sd->img_obj)
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 867ad841e..9157f312f 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -233,7 +233,7 @@ _elm_tooltip_reconfigure_job_stop(Elm_Tooltip *tt)
233static void 233static void
234_elm_tooltip_reconfigure_job_start(Elm_Tooltip *tt) 234_elm_tooltip_reconfigure_job_start(Elm_Tooltip *tt)
235{ 235{
236 if (tt->reconfigure_job) ecore_job_del(tt->reconfigure_job); 236 ecore_job_del(tt->reconfigure_job);
237 tt->reconfigure_job = ecore_job_add(_elm_tooltip_reconfigure_job, tt); 237 tt->reconfigure_job = ecore_job_add(_elm_tooltip_reconfigure_job, tt);
238} 238}
239 239