From: raster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 6 Mar 2012 12:08:11 +0000 (+0000)
Subject: warn+bug--
X-Git-Tag: REL_F_I9500_20120323_1~17^2~318
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37136bb7e51bd54bb1451abe2d10080aecd611ea;p=framework%2Fuifw%2Felementary.git

warn+bug--



git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68816 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 2407d43..f210073 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -445,16 +445,20 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 static Evas_Object *
 _item_content_unset_hook(Elm_Object_Item *it, const char *part)
 {
-   if (part && strcmp(part, "object")) return;
+   Evas_Object *o;
+   double scale;
+   
+   if (part && strcmp(part, "object")) return NULL;
    Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it;
    Evas_Object *obj = WIDGET(item);
    Widget_Data *wd = elm_widget_data_get(obj);
-   double scale;
    edje_object_part_unswallow(VIEW(it), item->object);
    elm_widget_sub_object_del(obj, item->object);
+   o = item->object;
    item->object = NULL;
    scale = (elm_widget_scale_get(obj) * _elm_config->scale);
    _theme_hook_item(obj, item, scale, wd->icon_size);
+   return o;
 }
 
 static void