notify: change return value of "theme_apply" function with inner _theme_apply
authorJinyong Park <j4939.park@samsung.com>
Tue, 5 Jul 2016 12:03:42 +0000 (21:03 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Tue, 5 Jul 2016 12:06:21 +0000 (21:06 +0900)
Summary:
notify's theme_apply function return value with eo_do_super(... elm_object_widget_theme_apply)
but notify's super class is widget, widget_theme_apply return always ELM_THEME_APPLY_SUCCESS.
so, notify's theme_apply function always return ELM_THEME_APPLY_SUCCESS, if it couldn't apply style correctly.

notify apply style via _notify_theme_apply function, so that function must decide theme_apply function's return value.

Reviewers: herb, singh.amitesh, Hermet, cedric, raster, jpeg

Reviewed By: jpeg

Differential Revision: https://phab.enlightenment.org/D4130

src/lib/elementary/elm_notify.c

index 36d115b..57d53a8 100644 (file)
@@ -19,7 +19,7 @@
 #define MY_CLASS_NAME "Elm_Notify"
 #define MY_CLASS_NAME_LEGACY "elm_notify"
 
-static void
+static Elm_Theme_Apply
 _notify_theme_apply(Evas_Object *obj)
 {
    const char *style = elm_widget_style_get(obj);
@@ -59,7 +59,7 @@ _notify_theme_apply(Evas_Object *obj)
           position = "center";
      }
 
-   elm_widget_theme_object_set(obj, sd->notify, "notify", position, style);
+   return elm_widget_theme_object_set(obj, sd->notify, "notify", position, style);
 }
 
 /**
@@ -149,7 +149,7 @@ _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
 
-   _notify_theme_apply(obj);
+   int_ret &= _notify_theme_apply(obj);
    if (sd->block_events) _block_events_theme_apply(obj);
 
    edje_object_scale_set