From 9baca711689d3446c441249dfc213b1d494395f7 Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Fri, 10 Jul 2015 20:54:23 +0530 Subject: [PATCH] toolbar: Check return value of elm_layout_theme_set. --- src/lib/elm_toolbar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index cbff114..7849220 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -1223,7 +1223,8 @@ _item_theme_hook(Evas_Object *obj, if (!it->separator && !it->object) { - elm_layout_theme_set(view, "toolbar", "item", style); + if (!elm_layout_theme_set(view, "toolbar", "item", style)) + CRI("Failed to set layout!"); if (it->selected) { elm_layout_signal_emit(view, "elm,state,selected", "elm"); @@ -1257,13 +1258,13 @@ _item_theme_hook(Evas_Object *obj, { if (!it->object) { - elm_layout_theme_set - (view, "toolbar", "separator", style); + if (!elm_layout_theme_set(view, "toolbar", "separator", style)) + CRI("Failed to set layout!"); } else { - elm_layout_theme_set - (view, "toolbar", "object", style); + if (!elm_layout_theme_set(view, "toolbar", "object", style)) + CRI("Failed to set layout!"); elm_layout_content_set(view, "elm.swallow.object", it->object); } } @@ -2371,8 +2372,9 @@ _item_new(Evas_Object *obj, evas_object_del(icon_obj); } - elm_layout_theme_set - (VIEW(it), "toolbar", "item", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (VIEW(it), "toolbar", "item", elm_widget_style_get(obj))) + CRI("Failed to set layout!"); elm_layout_signal_callback_add (VIEW(it), "elm,action,click", "elm", _select_cb, it); elm_layout_signal_callback_add -- 2.7.4