[EGIT] [core/elementary] master 46/59: elm_prefs.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.

[Daniel Juyung Seo]

seoz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=fcf896909f5041e26fef5db46e164d35a420663b

commit fcf896909f5041e26fef5db46e164d35a420663b
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Sat Oct 5 17:15:16 2013 +0900

    elm_prefs.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
 src/lib/elm_prefs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index cf52d29..28694a2 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -127,7 +127,7 @@ static Eina_Bool
 _elm_prefs_save(void *data)
 {
    ELM_PREFS_DATA_GET(data, sd);
-   Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+   ELM_WIDGET_DATA_GET_OR_RETURN(data, wd, ECORE_CALLBACK_CANCEL);
 
    if (!sd->dirty || !sd->prefs_data) goto end;
 
@@ -295,7 +295,7 @@ _elm_prefs_item_changed_report(Eo *obj,
                                Elm_Prefs_Item_Node *it)
 {
    char buf[PATH_MAX];
-   Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
    snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
 
@@ -397,7 +397,7 @@ _prefs_data_autosaved_cb(void *cb_data,
                          void *event_info)
 {
    ELM_PREFS_DATA_GET(cb_data, sd);
-   Elm_Widget_Smart_Data *wd = eo_data_scope_get(cb_data, 
ELM_OBJ_WIDGET_CLASS);
+   ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
 
    evas_object_smart_callback_call
      (wd->obj, SIG_PAGE_SAVED, event_info);
@@ -560,7 +560,7 @@ _item_changed_cb(Evas_Object *it_obj)
    snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
 
    ELM_PREFS_DATA_GET(it->prefs, sd);
-   Elm_Widget_Smart_Data *wd = eo_data_scope_get(it->prefs, 
ELM_OBJ_WIDGET_CLASS);
+   ELM_WIDGET_DATA_GET_OR_RETURN(it->prefs, wd);
 
    if (sd->values_fetching) goto end;
 

--