summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-07-13 15:45:44 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-07-13 15:51:11 +0900
commitacbf6034203cbfa0965226322db36e1350477e07 (patch)
tree13cc4bcd4fcdcf5e07973434e28e5db2b4d78ffb
parent6f6d903722e434b08807875090a7fe39899fb305 (diff)
elm_list.c: fixed elm_object_item_part_content_set bug with 'end' part in elm_list.
backport of 936a48c158ad1375ae7dd74236c1793c95393084.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_list.c7
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 38627141e..b1bac108e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -827,3 +827,7 @@
827 827
8282013-06-13 Rafael Antognolli 8282013-06-13 Rafael Antognolli
829 * Get the framespace from the theme. 829 * Get the framespace from the theme.
830
8312013-07-13 Daniel Juyung Seo
832
833 * Fix elm_object_item_part_content_set bug with end content in elm_list.
diff --git a/NEWS b/NEWS
index a21771f83..5d84f197d 100644
--- a/NEWS
+++ b/NEWS
@@ -158,6 +158,7 @@ Fixes:
158 * Fix elm_transit image animation that last few frames are skipped. 158 * Fix elm_transit image animation that last few frames are skipped.
159 * FIx elm_transit to accept proxy object. 159 * FIx elm_transit to accept proxy object.
160 * Fix a memory leak of elm_genlist - EINA_LIST_FREE should be used for returned value of elm_genlist_realized_items_get 160 * Fix a memory leak of elm_genlist - EINA_LIST_FREE should be used for returned value of elm_genlist_realized_items_get
161 * Fix elm_object_item_part_content_set bug with end content in elm_list.
161 162
162Changes since Elementary 1.0.0: 163Changes since Elementary 1.0.0:
163------------------------- 164-------------------------
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 82dfb98a2..3a1b35278 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1236,7 +1236,12 @@ _item_content_set_hook(Elm_Object_Item *it,
1236 *icon_p = content; 1236 *icon_p = content;
1237 1237
1238 if (VIEW(item)) 1238 if (VIEW(item))
1239 edje_object_part_swallow(VIEW(item), "elm.swallow.icon", content); 1239 {
1240 if (!strcmp(part, "start"))
1241 edje_object_part_swallow(VIEW(item), "elm.swallow.icon", content);
1242 else
1243 edje_object_part_swallow(VIEW(item), "elm.swallow.end", content);
1244 }
1240} 1245}
1241 1246
1242static Evas_Object * 1247static Evas_Object *