From: Tae-Hwan Kim <the81.kim@samsung.com>
Date: Mon, 23 Apr 2012 05:45:19 +0000 (+0900)
Subject: Elementary migration revision 70375
X-Git-Tag: sbs/armel/slp2-target~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=7db660f4d4570360151c8dfb98371c1e8b0b48cf;p=framework%2Fuifw%2Felementary.git

Elementary migration revision 70375
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	src/lib/elm_genlist.c
	src/lib/elm_toolbar.c

Change-Id: I1a214a018f4d093ae52015ce223955e57ff902cc
---

7db660f4d4570360151c8dfb98371c1e8b0b48cf
diff --cc configure.ac
index 22be3c5,d8d0dc4..8eef396
mode 100755,100644..100755
--- a/configure.ac
+++ b/configure.ac
diff --cc src/lib/elm_toolbar.c
index bfff34d,2a883c1..7293bd1
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@@ -1005,11 -1000,7 +1005,11 @@@ _item_new(Evas_Object *obj, const char 
          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);
 +   if (it->label)
 +     {
-         edje_object_part_text_set(VIEW(it), "elm.text", 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");
 +     }
     mw = mh = -1;
     elm_coords_finger_size_adjust(1, &mw, 1, &mh);
     edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
@@@ -1047,8 -1038,7 +1047,8 @@@ _elm_toolbar_item_label_update(Elm_Tool
  {
     Evas_Coord mw = -1, mh = -1;
     Widget_Data *wd = elm_widget_data_get(WIDGET(item));
-    edje_object_part_text_set(VIEW(item), "elm.text", item->label);
+    edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
 +   edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
  
     elm_coords_finger_size_adjust(1, &mw, 1, &mh);
     edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);