From 84d48b498cf127edf9e36b0b250fa94117b62e85 Mon Sep 17 00:00:00 2001 From: Jinyong Park Date: Tue, 5 Jul 2016 21:03:42 +0900 Subject: [PATCH] notify: change return value of "theme_apply" function with inner _theme_apply 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 36d115b..57d53a8 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -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 -- 2.7.4