summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-06-09 16:20:05 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commitfc753552ec87d3a6773a961537a7010dc0ae1af0 (patch)
tree7e759de3cbc56cbb9919ed1a0ae80b8e049186ef
parent500ad949defa7f3768c84ef987787ff48ba679d7 (diff)
elm_clock, elm_flipselector: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_clock.c4
-rw-r--r--src/lib/elm_flipselector.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 4195e8321..b7a7139a3 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -73,7 +73,7 @@ _on_clock_val_up(void *data)
73 sd->interval = sd->interval / 1.05; 73 sd->interval = sd->interval / 1.05;
74 ecore_timer_interval_set(sd->spin, sd->interval); 74 ecore_timer_interval_set(sd->spin, sd->interval);
75 _time_update(data, EINA_FALSE); 75 _time_update(data, EINA_FALSE);
76 evas_object_smart_callback_call(data, SIG_CHANGED, NULL); 76 eo_do(data, eo_event_callback_call(ELM_CLOCK_EVENT_CHANGED, NULL));
77 return ECORE_CALLBACK_RENEW; 77 return ECORE_CALLBACK_RENEW;
78 78
79clock_val_up_cancel: 79clock_val_up_cancel:
@@ -128,7 +128,7 @@ _on_clock_val_down(void *data)
128 sd->interval = sd->interval / 1.05; 128 sd->interval = sd->interval / 1.05;
129 ecore_timer_interval_set(sd->spin, sd->interval); 129 ecore_timer_interval_set(sd->spin, sd->interval);
130 _time_update(data, EINA_FALSE); 130 _time_update(data, EINA_FALSE);
131 evas_object_smart_callback_call(data, SIG_CHANGED, NULL); 131 eo_do(data, eo_event_callback_call(ELM_CLOCK_EVENT_CHANGED, NULL));
132 return ECORE_CALLBACK_RENEW; 132 return ECORE_CALLBACK_RENEW;
133 133
134clock_val_down_cancel: 134clock_val_down_cancel:
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index ce6da7e17..cb5f03a50 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -230,8 +230,8 @@ _on_item_changed(Elm_Flipselector_Data *sd)
230 230
231 if (item->func) 231 if (item->func)
232 item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item); 232 item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
233 evas_object_smart_callback_call 233 eo_do(sd->obj, eo_event_callback_call
234 (sd->obj, SIG_SELECTED, eo_item); 234 (ELM_FLIPSELECTOR_EVENT_SELECTED, eo_item));
235} 235}
236 236
237static void 237static void
@@ -367,8 +367,8 @@ _flip_up(Elm_Flipselector_Data *sd)
367 if (sd->current == sd->items) 367 if (sd->current == sd->items)
368 { 368 {
369 sd->current = eina_list_last(sd->items); 369 sd->current = eina_list_last(sd->items);
370 evas_object_smart_callback_call 370 eo_do(sd->obj, eo_event_callback_call
371 (sd->obj, SIG_UNDERFLOWED, NULL); 371 (ELM_FLIPSELECTOR_EVENT_UNDERFLOWED, NULL));
372 } 372 }
373 else 373 else
374 sd->current = eina_list_prev(sd->current); 374 sd->current = eina_list_prev(sd->current);
@@ -392,8 +392,8 @@ _flip_down(Elm_Flipselector_Data *sd)
392 if (!sd->current) 392 if (!sd->current)
393 { 393 {
394 sd->current = sd->items; 394 sd->current = sd->items;
395 evas_object_smart_callback_call 395 eo_do(sd->obj, eo_event_callback_call
396 (sd->obj, SIG_OVERFLOWED, NULL); 396 (ELM_FLIPSELECTOR_EVENT_OVERFLOWED, NULL));
397 } 397 }
398 398
399 eo_item = DATA_GET(sd->current); 399 eo_item = DATA_GET(sd->current);