summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Ellur <vivek.ellur@samsung.com>2015-08-28 16:14:31 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-08-28 16:14:31 +0900
commit0b65301d3bbc9e843a45b6c399560ffb85718bc2 (patch)
tree06815faaff55d1aa4b1d038f767774ef2ca611ea
parent74981a3dbe01702181331c19fb880274faa2a0a7 (diff)
elm_conform: Port evas smart callbacks to eo
Summary: Changed evas_object_smart_callback_add functions to eo_event_callback_add functions Signed-off-by: Vivek Ellur <vivek.ellur@samsung.com> Reviewers: cedric, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2996
-rw-r--r--src/lib/elm_conform.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 543aa7d90..dd32aa469 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -348,9 +348,10 @@ _land_indicator_connect_cb(void *data)
348 return ECORE_CALLBACK_RENEW; 348 return ECORE_CALLBACK_RENEW;
349} 349}
350 350
351static void 351static Eina_Bool
352_land_indicator_disconnected(void *data, 352_land_indicator_disconnected(void *data,
353 Evas_Object *obj EINA_UNUSED, 353 Eo *obj EINA_UNUSED,
354 const Eo_Event_Description *desc EINA_UNUSED,
354 void *event_info EINA_UNUSED) 355 void *event_info EINA_UNUSED)
355{ 356{
356 Evas_Object *conform = data; 357 Evas_Object *conform = data;
@@ -359,11 +360,13 @@ _land_indicator_disconnected(void *data,
359 360
360 sd->land_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, 361 sd->land_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME,
361 _land_indicator_connect_cb, conform); 362 _land_indicator_connect_cb, conform);
363 return EINA_TRUE;
362} 364}
363 365
364static void 366static Eina_Bool
365_port_indicator_disconnected(void *data, 367_port_indicator_disconnected(void *data,
366 Evas_Object *obj EINA_UNUSED, 368 Eo *obj EINA_UNUSED,
369 const Eo_Event_Description *desc EINA_UNUSED,
367 void *event_info EINA_UNUSED) 370 void *event_info EINA_UNUSED)
368{ 371{
369 Evas_Object *conform = data; 372 Evas_Object *conform = data;
@@ -372,6 +375,7 @@ _port_indicator_disconnected(void *data,
372 375
373 sd->port_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, 376 sd->port_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME,
374 _port_indicator_connect_cb, conform); 377 _port_indicator_connect_cb, conform);
378 return EINA_TRUE;
375} 379}
376 380
377static Evas_Object * 381static Evas_Object *
@@ -407,8 +411,8 @@ _create_portrait_indicator(Evas_Object *obj)
407 } 411 }
408 412
409 elm_widget_sub_object_add(obj, port_indicator); 413 elm_widget_sub_object_add(obj, port_indicator);
410 evas_object_smart_callback_add(port_indicator, "image.deleted", _port_indicator_disconnected, obj); 414 eo_do(port_indicator, eo_event_callback_add
411 415 (ELM_PLUG_EVENT_IMAGE_DELETED, _port_indicator_disconnected, NULL));
412 evas_object_size_hint_min_set(port_indicator, -1, 0); 416 evas_object_size_hint_min_set(port_indicator, -1, 0);
413 evas_object_size_hint_max_set(port_indicator, -1, 0); 417 evas_object_size_hint_max_set(port_indicator, -1, 0);
414 418
@@ -448,8 +452,8 @@ _create_landscape_indicator(Evas_Object *obj)
448 } 452 }
449 453
450 elm_widget_sub_object_add(obj, land_indicator); 454 elm_widget_sub_object_add(obj, land_indicator);
451 evas_object_smart_callback_add(land_indicator, "image.deleted",_land_indicator_disconnected, obj); 455 eo_do(land_indicator, eo_event_callback_add
452 456 (ELM_PLUG_EVENT_IMAGE_DELETED, _land_indicator_disconnected, NULL));
453 evas_object_size_hint_min_set(land_indicator, -1, 0); 457 evas_object_size_hint_min_set(land_indicator, -1, 0);
454 evas_object_size_hint_max_set(land_indicator, -1, 0); 458 evas_object_size_hint_max_set(land_indicator, -1, 0);
455 return land_indicator; 459 return land_indicator;