[EGIT] [core/elementary] master 01/01: elm_genlist.c: return "elm.swallow.icon" part's object when the part parameter is null on _item_content_get_hook().

[Daniel Juyung Seo]

seoz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=b236c2ad01e41151a04f4a87c7ffdb1569777349

commit b236c2ad01e41151a04f4a87c7ffdb1569777349
Author: Daniel Juyung Seo <juyung....@samsung.com>
Date:   Sat Nov 30 18:28:47 2013 +0900

    elm_genlist.c: return "elm.swallow.icon" part's object when the part 
parameter is null on _item_content_get_hook().
    
    Now elm_object_item_content_get() works fine.
    + avoid ambiguous if-else statement by using braces.
---
 src/lib/elm_genlist.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 19d76e35..c432419 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5202,7 +5202,12 @@ _item_content_get_hook(Elm_Gen_Item *it,
    else if (it->decorate_it_set)
      ret = edje_object_part_swallow_get(it->item->deco_it_view, part);
    if (!ret)
-     ret = edje_object_part_swallow_get(VIEW(it), part);
+     {
+        if (part)
+          ret = edje_object_part_swallow_get(VIEW(it), part);
+        else
+          ret = edje_object_part_swallow_get(VIEW(it), "elm.swallow.icon");
+     }
    return ret;
 }
 
@@ -5217,10 +5222,12 @@ _item_text_get_hook(Elm_Gen_Item *it,
    else if (it->decorate_it_set)
      ret = edje_object_part_text_get(it->item->deco_it_view, part);
    if (!ret)
-     if (part)
-       ret = edje_object_part_text_get(VIEW(it), part);
-     else
-       ret = edje_object_part_text_get(VIEW(it), "elm.text");
+     {
+        if (part)
+          ret = edje_object_part_text_get(VIEW(it), part);
+        else
+          ret = edje_object_part_text_get(VIEW(it), "elm.text");
+     }
    return ret;
 }
 

--