summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-14 13:31:40 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:33 +0300
commite7034502485b0cfddb091a16cdc3eda0da793252 (patch)
tree370ed44f21d56d9eefa1570204f6eb420cc7c81f
parente4a3bd43a93f5952f3b944a45f8d92aea1a4d298 (diff)
elm_prefs, elm_check: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_check.c6
-rw-r--r--src/lib/elm_prefs.c24
2 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index be376a65e..8923418e5 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -68,7 +68,7 @@ _activate(Evas_Object *obj)
68 _elm_access_say(E_("State: Off")); 68 _elm_access_say(E_("State: Off"));
69 } 69 }
70 70
71 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 71 eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
72 72
73 if (_elm_config->atspi_mode) 73 if (_elm_config->atspi_mode)
74 elm_interface_atspi_accessible_state_changed_signal_emit(obj, 74 elm_interface_atspi_accessible_state_changed_signal_emit(obj,
@@ -273,7 +273,7 @@ _on_check_off(void *data,
273 if (sd->statep) *sd->statep = sd->state; 273 if (sd->statep) *sd->statep = sd->state;
274 274
275 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 275 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
276 evas_object_smart_callback_call(data, SIG_CHANGED, NULL); 276 eo_do(data, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
277 277
278 if (_elm_config->atspi_mode) 278 if (_elm_config->atspi_mode)
279 elm_interface_atspi_accessible_state_changed_signal_emit(data, 279 elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -294,7 +294,7 @@ _on_check_on(void *data,
294 sd->state = EINA_TRUE; 294 sd->state = EINA_TRUE;
295 if (sd->statep) *sd->statep = sd->state; 295 if (sd->statep) *sd->statep = sd->state;
296 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 296 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
297 evas_object_smart_callback_call(data, SIG_CHANGED, NULL); 297 eo_do(data, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
298 298
299 if (_elm_config->atspi_mode) 299 if (_elm_config->atspi_mode)
300 elm_interface_atspi_accessible_state_changed_signal_emit(data, 300 elm_interface_atspi_accessible_state_changed_signal_emit(data,
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 585e32977..2bb88808d 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -136,8 +136,8 @@ _elm_prefs_save(void *data)
136 { 136 {
137 elm_prefs_data_save(sd->prefs_data, NULL, NULL); 137 elm_prefs_data_save(sd->prefs_data, NULL, NULL);
138 138
139 evas_object_smart_callback_call 139 eo_do(wd->obj, eo_event_callback_call
140 (wd->obj, SIG_PAGE_SAVED, (char *)sd->root->name); 140 (ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name));
141 } 141 }
142 142
143 sd->dirty = EINA_FALSE; 143 sd->dirty = EINA_FALSE;
@@ -300,8 +300,8 @@ _elm_prefs_item_changed_report(Eo *obj,
300 300
301 snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name); 301 snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
302 302
303 evas_object_smart_callback_call 303 eo_do(wd->obj, eo_event_callback_call
304 (wd->obj, SIG_ITEM_CHANGED, buf); 304 (ELM_PREFS_EVENT_ITEM_CHANGED, buf));
305} 305}
306 306
307static Elm_Prefs_Item_Node * 307static Elm_Prefs_Item_Node *
@@ -400,8 +400,8 @@ _prefs_data_autosaved_cb(void *cb_data,
400 ELM_PREFS_DATA_GET(cb_data, sd); 400 ELM_PREFS_DATA_GET(cb_data, sd);
401 ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd); 401 ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
402 402
403 evas_object_smart_callback_call 403 eo_do(wd->obj, eo_event_callback_call
404 (wd->obj, SIG_PAGE_SAVED, event_info); 404 (ELM_PREFS_EVENT_PAGE_SAVED, event_info));
405 405
406 sd->dirty = EINA_FALSE; 406 sd->dirty = EINA_FALSE;
407} 407}
@@ -556,8 +556,8 @@ _item_changed_cb(Evas_Object *it_obj)
556 /* we use the changed cb on ACTION/RESET/SAVE items specially */ 556 /* we use the changed cb on ACTION/RESET/SAVE items specially */
557 if (it->type == ELM_PREFS_TYPE_ACTION) 557 if (it->type == ELM_PREFS_TYPE_ACTION)
558 { 558 {
559 evas_object_smart_callback_call 559 eo_do(wd->obj, eo_event_callback_call
560 (wd->obj, SIG_ACTION, buf); 560 (ELM_PREFS_EVENT_ACTION, buf));
561 561
562 return; 562 return;
563 } 563 }
@@ -1175,8 +1175,8 @@ _elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd, const char *file, cons
1175 1175
1176 _elm_prefs_values_get_default(sd->root, EINA_FALSE); 1176 _elm_prefs_values_get_default(sd->root, EINA_FALSE);
1177 1177
1178 evas_object_smart_callback_call 1178 eo_do(obj, eo_event_callback_call
1179 (obj, SIG_PAGE_LOADED, (char *)sd->root->name); 1179 (ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name));
1180 1180
1181 return EINA_TRUE; 1181 return EINA_TRUE;
1182} 1182}
@@ -1220,8 +1220,8 @@ _elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd, Elm_Prefs_Data *prefs_data)
1220 sd->values_fetching = EINA_FALSE; 1220 sd->values_fetching = EINA_FALSE;
1221 1221
1222end: 1222end:
1223 evas_object_smart_callback_call 1223 eo_do(obj, eo_event_callback_call
1224 (obj, SIG_PAGE_CHANGED, (char *)sd->root->name); 1224 (ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name));
1225 1225
1226 return EINA_TRUE; 1226 return EINA_TRUE;
1227} 1227}