summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-13 14:47:09 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:33 +0300
commit32eceee93225d7353e54fa5a7e0beb6e364e789a (patch)
tree87e864b6a12706a7f5f4acf4e5ebe7701a22b215
parent60cb698ac9918d0fb068b07fe87efeeb874cb047 (diff)
elm_slideshow, elm_plug: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_plug.c8
-rw-r--r--src/lib/elm_slideshow.c12
2 files changed, 12 insertions, 8 deletions
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index d7f4448ef..b210d4e89 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -42,9 +42,9 @@ _elm_plug_disconnected(Ecore_Evas *ee)
42{ 42{
43 Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY); 43 Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
44 EINA_SAFETY_ON_NULL_RETURN(plug); 44 EINA_SAFETY_ON_NULL_RETURN(plug);
45 evas_object_smart_callback_call(plug, SIG_IMAGE_DELETED, NULL); 45 eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_DELETED, NULL));
46 /* TODO: was a typo. Deprecated, remove in future releases: */ 46 /* TODO: was a typo. Deprecated, remove in future releases: */
47 evas_object_smart_callback_call(plug, "image.deleted", NULL); 47 eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_DELETED, NULL));
48} 48}
49 49
50static void 50static void
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
55 EINA_SAFETY_ON_NULL_RETURN(plug); 55 EINA_SAFETY_ON_NULL_RETURN(plug);
56 56
57 ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h)); 57 ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
58 evas_object_smart_callback_call(plug, SIG_IMAGE_RESIZED, &size); 58 eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_RESIZED, &size));
59} 59}
60 60
61EOLIAN static Eina_Bool 61EOLIAN static Eina_Bool
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
103 if (ev->button != 1) return; 103 if (ev->button != 1) return;
104 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 104 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
105 105
106 evas_object_smart_callback_call(data, SIG_CLICKED, NULL); 106 eo_do(data, eo_event_callback_call(ELM_PLUG_EVENT_CLICKED, NULL));
107} 107}
108 108
109EOLIAN static void 109EOLIAN static void
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 87542c089..7d9c454d4 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -271,7 +271,8 @@ _on_slideshow_end(void *data,
271 elm_layout_signal_emit(data, "anim,end", "slideshow"); 271 elm_layout_signal_emit(data, "anim,end", "slideshow");
272 272
273 if (emission != NULL) 273 if (emission != NULL)
274 evas_object_smart_callback_call(data, SIG_TRANSITION_END, EO_OBJ(sd->current)); 274 eo_do(data, eo_event_callback_call
275 (ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current)));
275} 276}
276 277
277static Eina_Bool 278static Eina_Bool
@@ -480,7 +481,8 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED, Elm_Slideshow_Item_Data *item)
480 481
481 sd->previous = sd->current; 482 sd->previous = sd->current;
482 sd->current = next; 483 sd->current = next;
483 evas_object_smart_callback_call(WIDGET(item), SIG_CHANGED, EO_OBJ(sd->current)); 484 eo_do(WIDGET(item), eo_event_callback_call
485 (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
484} 486}
485 487
486EOLIAN static void 488EOLIAN static void
@@ -517,7 +519,8 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
517 519
518 sd->previous = sd->current; 520 sd->previous = sd->current;
519 sd->current = next; 521 sd->current = next;
520 evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd->current)); 522 eo_do(obj, eo_event_callback_call
523 (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
521} 524}
522 525
523EOLIAN static void 526EOLIAN static void
@@ -554,7 +557,8 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
554 557
555 sd->previous = sd->current; 558 sd->previous = sd->current;
556 sd->current = prev; 559 sd->current = prev;
557 evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd->current)); 560 eo_do(obj, eo_event_callback_call
561 (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
558} 562}
559 563
560EOLIAN static const Eina_List* 564EOLIAN static const Eina_List*