[genlist, gen, gen_common] merge upstream except for elm_genlist.c

[framework/uifw/elementary.git] / doc / widgets / widget_preview_genlist1.c

diff --git a/doc/widgets/widget_preview_genlist1.c b/doc/widgets/widget_preview_genlist1.c
index c82e98a..3edb65d 100644 (file)
--- a/doc/widgets/widget_preview_genlist1.c
+++ b/doc/widgets/widget_preview_genlist1.c
@@ -34,11 +34,7 @@ elm_win_resize_object_add(win, genlist);
 evas_object_show(genlist);
 
 Elm_Genlist_Item_Class gic;
-<<<<<<< HEAD
-Elm_Object_Item *it, *top;
-=======
 Elm_Object_Item *glit, *glit_top;
->>>>>>> remotes/origin/upstream
 gic.item_style = "default";
 gic.func.text_get = _text_get;
 gic.func.content_get = _content_get;
@@ -47,18 +43,6 @@ gic.func.del = NULL;
 
 elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-<<<<<<< HEAD
-it = elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-top = it;
-elm_genlist_item_expanded_set(it, EINA_TRUE);
-elm_genlist_item_append(genlist, &gic, NULL, it, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-it = elm_genlist_item_append(genlist, &gic, NULL, it, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-elm_genlist_item_append(genlist, &gic, NULL, it, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-
-elm_genlist_item_top_show(top);
-=======
 glit = elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 glit_top = glit;
 elm_genlist_item_expanded_set(glit, EINA_TRUE);
@@ -69,6 +53,5 @@ elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL,
 elm_genlist_item_append(genlist, &gic, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
 elm_genlist_item_show(glit_top, ELM_GENLIST_ITEM_SCROLLTO_TOP);
->>>>>>> remotes/origin/upstream
 
 #include "widget_preview_tmpl_foot.c"