X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_toolbar.c;h=6bbebb6bdb67c889194857098b730a5a0658f21e;hb=8d5275d5db79b4bd83ab88e3d48feec63ddbd5bc;hp=4ac44f4661f363c89924e89a6ea564d75217f528;hpb=93f2c1f7713037494cc79145db132e04ca8659d8;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 4ac44f4..6bbebb6 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -378,8 +378,11 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
              edje_object_part_swallow(view, "elm.swallow.icon", it->icon);
              edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
           }
-        edje_object_part_text_escaped_set(view, "elm.text", it->label);
-        edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+        if (it->label)
+          {
+             edje_object_part_text_escaped_set(view, "elm.text", it->label);
+             edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+          }
      }
    else
      {
@@ -1083,8 +1086,11 @@ _item_reorder_start(Elm_Toolbar_Item *item)
         evas_object_show(it->icon);
         elm_widget_sub_object_add(obj, it->icon);
      }
-   edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
-   edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+   if (it->label)
+     {
+        edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
+        edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+     }
 
    edje_object_signal_emit(VIEW(it), "elm,state,moving", "elm");