summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-07 18:04:13 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commit57d5740f9c0f7889a71bf353ac1de021bc5722b2 (patch)
tree51cec3e604324a25012606bcd6e1c4e59d223285
parent6ed6a6c4fda0284cfebc758551c788ede5c0da0f (diff)
elm_thumb: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_thumb.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index cdcfeed93..888547f3e 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -62,9 +62,9 @@ _mouse_down_cb(void *data,
62 else sd->on_hold = EINA_FALSE; 62 else sd->on_hold = EINA_FALSE;
63 63
64 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 64 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
65 evas_object_smart_callback_call(obj, SIG_CLICKED_DOUBLE, NULL); 65 eo_do(obj, eo_event_callback_call(ELM_THUMB_EVENT_CLICKED_DOUBLE, NULL));
66 else 66 else
67 evas_object_smart_callback_call(obj, SIG_PRESS, NULL); 67 eo_do(obj, eo_event_callback_call(ELM_THUMB_EVENT_PRESS, NULL));
68} 68}
69 69
70static void 70static void
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
81 else sd->on_hold = EINA_FALSE; 81 else sd->on_hold = EINA_FALSE;
82 82
83 if (!sd->on_hold) 83 if (!sd->on_hold)
84 evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); 84 eo_do(obj, eo_event_callback_call(ELM_THUMB_EVENT_CLICKED, NULL));
85 85
86 sd->on_hold = EINA_FALSE; 86 sd->on_hold = EINA_FALSE;
87} 87}
@@ -115,8 +115,8 @@ _thumb_ready_inform(Elm_Thumb_Data *sd,
115 edje_object_signal_emit 115 edje_object_signal_emit
116 (wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm"); 116 (wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
117 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm"); 117 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
118 evas_object_smart_callback_call 118 eo_do(sd->obj, eo_event_callback_call
119 (sd->obj, SIG_GENERATE_STOP, NULL); 119 (ELM_THUMB_EVENT_GENERATE_STOP, NULL));
120} 120}
121 121
122static void 122static void
@@ -293,16 +293,16 @@ _thumb_finish(Elm_Thumb_Data *sd,
293 wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS); 293 wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
294 edje_object_signal_emit 294 edje_object_signal_emit
295 (wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm"); 295 (wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
296 evas_object_smart_callback_call 296 eo_do(sd->obj, eo_event_callback_call
297 (sd->obj, SIG_LOAD_ERROR, NULL); 297 (ELM_THUMB_EVENT_LOAD_ERROR, NULL));
298 } 298 }
299 299
300 return; 300 return;
301 301
302err: 302err:
303 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm"); 303 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
304 evas_object_smart_callback_call 304 eo_do(sd->obj, eo_event_callback_call
305 (sd->obj, SIG_LOAD_ERROR, NULL); 305 (ELM_THUMB_EVENT_LOAD_ERROR, NULL));
306} 306}
307 307
308static void 308static void
@@ -349,8 +349,8 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
349 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 349 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
350 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm"); 350 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm");
351 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm"); 351 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
352 evas_object_smart_callback_call 352 eo_do(sd->obj, eo_event_callback_call
353 (sd->obj, SIG_GENERATE_ERROR, NULL); 353 (ELM_THUMB_EVENT_GENERATE_ERROR, NULL));
354} 354}
355 355
356static void 356static void
@@ -389,8 +389,8 @@ _thumb_start(Elm_Thumb_Data *sd)
389 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd); 389 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
390 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm"); 390 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm");
391 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm"); 391 edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm");
392 evas_object_smart_callback_call 392 eo_do(sd->obj, eo_event_callback_call
393 (sd->obj, SIG_GENERATE_START, NULL); 393 (ELM_THUMB_EVENT_GENERATE_START, NULL));
394 394
395 pending_request++; 395 pending_request++;
396 ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key); 396 ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key);
@@ -482,8 +482,8 @@ _elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data *sd)
482 482
483 edje_object_signal_emit 483 edje_object_signal_emit
484 (wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm"); 484 (wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
485 evas_object_smart_callback_call 485 eo_do(sd->obj, eo_event_callback_call
486 (sd->obj, SIG_GENERATE_STOP, NULL); 486 (ELM_THUMB_EVENT_GENERATE_STOP, NULL));
487 } 487 }
488 488
489 if (sd->thumb.retry) 489 if (sd->thumb.retry)