summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyoyoung Chang <hyoyoung@gmail.com>2012-03-24 11:14:20 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-03-24 11:14:20 +0000
commitf3df9c356f0ee0fdae5c3f89825a1c6396b1dc87 (patch)
tree2bf84761a736daea5f72d60eac1619daa77536a1
parent5e084a7b241d274fed441450a5bd431c1d5c2efe (diff)
From: Hyoyoung Chang <hyoyoung@gmail.com>
Subject: [E-devel] [patch] elm_genlist - add merging edc strings list I add like a routine in previous patch. It add merging routines to realize functions. also i removed "elm_widget_stringlist_free(cons)" because all of it is freed at item_unrealize. SVN revision: 69598
Diffstat (limited to '')
-rw-r--r--src/lib/elm_genlist.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 3aa5ad690..d7123fcd8 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1890,13 +1890,14 @@ _item_content_realize(Elm_Gen_Item *it,
1890 const Eina_List *l; 1890 const Eina_List *l;
1891 const char *key; 1891 const char *key;
1892 Evas_Object *ic = NULL; 1892 Evas_Object *ic = NULL;
1893 Eina_List *cons = NULL;
1893 1894
1894 *source = elm_widget_stringlist_get(edje_object_data_get(target, "contents")); 1895 cons = elm_widget_stringlist_get(edje_object_data_get(target, "contents"));
1895 1896
1896 if (parts && (eina_list_count(*source) != eina_list_count(it->content_objs))) 1897 if (parts && (eina_list_count(*source) != eina_list_count(it->content_objs)))
1897 res = it->content_objs; 1898 res = it->content_objs;
1898 1899
1899 EINA_LIST_FOREACH(*source, l, key) 1900 EINA_LIST_FOREACH(cons, l, key)
1900 { 1901 {
1901 if (parts && fnmatch(parts, key, FNM_PERIOD)) 1902 if (parts && fnmatch(parts, key, FNM_PERIOD))
1902 continue; 1903 continue;
@@ -1914,6 +1915,7 @@ _item_content_realize(Elm_Gen_Item *it,
1914 elm_widget_disabled_set(ic, EINA_TRUE); 1915 elm_widget_disabled_set(ic, EINA_TRUE);
1915 } 1916 }
1916 } 1917 }
1918 *source = eina_list_merge(*source, cons);
1917 } 1919 }
1918 1920
1919 return res; 1921 return res;
@@ -1967,6 +1969,7 @@ _item_flips_realize(Elm_Gen_Item *it,
1967 const char *key; 1969 const char *key;
1968 Evas_Object *ic = NULL; 1970 Evas_Object *ic = NULL;
1969 Eina_List *cons = NULL; 1971 Eina_List *cons = NULL;
1972
1970 cons = elm_widget_stringlist_get(edje_object_data_get(target, "flips")); 1973 cons = elm_widget_stringlist_get(edje_object_data_get(target, "flips"));
1971 1974
1972 EINA_LIST_FOREACH(cons, l, key) 1975 EINA_LIST_FOREACH(cons, l, key)
@@ -1985,7 +1988,6 @@ _item_flips_realize(Elm_Gen_Item *it,
1985 } 1988 }
1986 } 1989 }
1987 *source = eina_list_merge(*source, cons); 1990 *source = eina_list_merge(*source, cons);
1988 elm_widget_stringlist_free(cons);
1989 } 1991 }
1990 1992
1991 return res; 1993 return res;