summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2011-10-24 02:10:35 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2011-10-24 02:10:35 +0000
commit2bb2b1f0ee2e98dff6e644f80d70118596bdbb94 (patch)
tree2d24e8746a83691b5e68f18e839aea599094fc95 /legacy
parent30040fc2f39ba7d2661227a6a6f29bd1dcf10457 (diff)
elm gen/gengrid/genlist: Changed item class's icon_get to content_get.
Do not limit the swallowed objects to icon. This had to be done before elm 1.0 and now it's time to break. This will break all applications which are using gengrid/genlist. Please fix it icon_get -> content_get. TODO 1. fix theme as well. 2. fix documents. SVN revision: 64344
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_gengrid.c4
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_genlist1.c4
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_genlist2.c4
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_genlist3.c4
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_genlist4.c4
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_genlist5.c4
-rw-r--r--legacy/elementary/src/bin/test_cursor.c4
-rw-r--r--legacy/elementary/src/bin/test_eio.c6
-rw-r--r--legacy/elementary/src/bin/test_floating.c4
-rw-r--r--legacy/elementary/src/bin/test_gengrid.c10
-rw-r--r--legacy/elementary/src/bin/test_genlist.c48
-rw-r--r--legacy/elementary/src/bin/test_icon_desktops.c4
-rw-r--r--legacy/elementary/src/bin/test_index.c2
-rw-r--r--legacy/elementary/src/bin/test_panel.c6
-rw-r--r--legacy/elementary/src/bin/test_tooltip.c4
-rw-r--r--legacy/elementary/src/examples/entry_example.c4
-rw-r--r--legacy/elementary/src/examples/gengrid_example.c4
-rw-r--r--legacy/elementary/src/examples/genlist_example_01.c4
-rw-r--r--legacy/elementary/src/examples/genlist_example_02.c4
-rw-r--r--legacy/elementary/src/examples/genlist_example_03.c4
-rw-r--r--legacy/elementary/src/examples/genlist_example_04.c8
-rw-r--r--legacy/elementary/src/examples/genlist_example_05.c12
-rw-r--r--legacy/elementary/src/examples/index_example_02.c4
-rw-r--r--legacy/elementary/src/examples/map_example_02.c16
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in43
-rw-r--r--legacy/elementary/src/lib/elc_fileselector.c6
-rw-r--r--legacy/elementary/src/lib/elm_gen.c10
-rw-r--r--legacy/elementary/src/lib/elm_gen.h2
-rw-r--r--legacy/elementary/src/lib/elm_gengrid.c14
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c53
-rw-r--r--legacy/elementary/src/lib/elm_store.c6
31 files changed, 158 insertions, 148 deletions
diff --git a/legacy/elementary/doc/widgets/widget_preview_gengrid.c b/legacy/elementary/doc/widgets/widget_preview_gengrid.c
index 4775a9aeea..f2cda97db9 100644
--- a/legacy/elementary/doc/widgets/widget_preview_gengrid.c
+++ b/legacy/elementary/doc/widgets/widget_preview_gengrid.c
@@ -14,7 +14,7 @@ _grid_label_get(void *data __UNUSED__,
14} 14}
15 15
16static Evas_Object * 16static Evas_Object *
17_grid_icon_get(void *data __UNUSED__, 17_grid_content_get(void *data __UNUSED__,
18 Evas_Object *obj, 18 Evas_Object *obj,
19 const char *part) 19 const char *part)
20{ 20{
@@ -41,7 +41,7 @@ evas_object_show(gengrid);
41Elm_Gengrid_Item_Class gic; 41Elm_Gengrid_Item_Class gic;
42gic.item_style = "default"; 42gic.item_style = "default";
43gic.func.label_get = _grid_label_get; 43gic.func.label_get = _grid_label_get;
44gic.func.icon_get = _grid_icon_get; 44gic.func.content_get = _grid_content_get;
45gic.func.state_get = NULL; 45gic.func.state_get = NULL;
46gic.func.del = NULL; 46gic.func.del = NULL;
47 47
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist1.c b/legacy/elementary/doc/widgets/widget_preview_genlist1.c
index d515956f14..67f70fa874 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist1.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist1.c
@@ -14,7 +14,7 @@ _label_get(void *data __UNUSED__,
14} 14}
15 15
16static Evas_Object * 16static Evas_Object *
17_icon_get(void *data __UNUSED__, 17_content_get(void *data __UNUSED__,
18 Evas_Object *obj, 18 Evas_Object *obj,
19 const char *part __UNUSED__) 19 const char *part __UNUSED__)
20{ 20{
@@ -37,7 +37,7 @@ Elm_Genlist_Item_Class gic;
37Elm_Genlist_Item *it, *top; 37Elm_Genlist_Item *it, *top;
38gic.item_style = "default"; 38gic.item_style = "default";
39gic.func.label_get = _label_get; 39gic.func.label_get = _label_get;
40gic.func.icon_get = _icon_get; 40gic.func.content_get = _content_get;
41gic.func.state_get = NULL; 41gic.func.state_get = NULL;
42gic.func.del = NULL; 42gic.func.del = NULL;
43 43
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist2.c b/legacy/elementary/doc/widgets/widget_preview_genlist2.c
index 15a1421934..e33b5f5b25 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist2.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist2.c
@@ -14,7 +14,7 @@ _label_get(void *data __UNUSED__,
14} 14}
15 15
16static Evas_Object * 16static Evas_Object *
17_icon_get(void *data __UNUSED__, 17_content_get(void *data __UNUSED__,
18 Evas_Object *obj, 18 Evas_Object *obj,
19 const char *part __UNUSED__) 19 const char *part __UNUSED__)
20{ 20{
@@ -36,7 +36,7 @@ evas_object_show(genlist);
36Elm_Genlist_Item_Class gic; 36Elm_Genlist_Item_Class gic;
37gic.item_style = "double_label"; 37gic.item_style = "double_label";
38gic.func.label_get = _label_get; 38gic.func.label_get = _label_get;
39gic.func.icon_get = _icon_get; 39gic.func.content_get = _content_get;
40gic.func.state_get = NULL; 40gic.func.state_get = NULL;
41gic.func.del = NULL; 41gic.func.del = NULL;
42 42
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist3.c b/legacy/elementary/doc/widgets/widget_preview_genlist3.c
index 0bbddbad4a..7dd7efb67f 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist3.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist3.c
@@ -14,7 +14,7 @@ _label_get(void *data __UNUSED__,
14} 14}
15 15
16static Evas_Object * 16static Evas_Object *
17_icon_get(void *data __UNUSED__, 17_content_get(void *data __UNUSED__,
18 Evas_Object *obj, 18 Evas_Object *obj,
19 const char *part __UNUSED__) 19 const char *part __UNUSED__)
20{ 20{
@@ -36,7 +36,7 @@ evas_object_show(genlist);
36Elm_Genlist_Item_Class gic; 36Elm_Genlist_Item_Class gic;
37gic.item_style = "icon_top_text_bottom"; 37gic.item_style = "icon_top_text_bottom";
38gic.func.label_get = _label_get; 38gic.func.label_get = _label_get;
39gic.func.icon_get = _icon_get; 39gic.func.content_get = _content_get;
40gic.func.state_get = NULL; 40gic.func.state_get = NULL;
41gic.func.del = NULL; 41gic.func.del = NULL;
42 42
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist4.c b/legacy/elementary/doc/widgets/widget_preview_genlist4.c
index 4cdc4c0912..efe4d82269 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist4.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist4.c
@@ -14,7 +14,7 @@ _label_get(void *data __UNUSED__,
14} 14}
15 15
16static Evas_Object * 16static Evas_Object *
17_icon_get(void *data __UNUSED__, 17_content_get(void *data __UNUSED__,
18 Evas_Object *obj, 18 Evas_Object *obj,
19 const char *part __UNUSED__) 19 const char *part __UNUSED__)
20{ 20{
@@ -36,7 +36,7 @@ evas_object_show(genlist);
36Elm_Genlist_Item_Class gic; 36Elm_Genlist_Item_Class gic;
37gic.item_style = "group_index"; 37gic.item_style = "group_index";
38gic.func.label_get = _label_get; 38gic.func.label_get = _label_get;
39gic.func.icon_get = _icon_get; 39gic.func.content_get = _content_get;
40gic.func.state_get = NULL; 40gic.func.state_get = NULL;
41gic.func.del = NULL; 41gic.func.del = NULL;
42 42
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist5.c b/legacy/elementary/doc/widgets/widget_preview_genlist5.c
index 5cdf682817..3a2f396f78 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist5.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist5.c
@@ -14,7 +14,7 @@ _label_get(void *data __UNUSED__,
14} 14}
15 15
16static Evas_Object * 16static Evas_Object *
17_icon_get(void *data __UNUSED__, 17_content_get(void *data __UNUSED__,
18 Evas_Object *obj, 18 Evas_Object *obj,
19 const char *part __UNUSED__) 19 const char *part __UNUSED__)
20{ 20{
@@ -36,7 +36,7 @@ evas_object_show(genlist);
36Elm_Genlist_Item_Class gic; 36Elm_Genlist_Item_Class gic;
37gic.item_style = "default"; 37gic.item_style = "default";
38gic.func.label_get = _label_get; 38gic.func.label_get = _label_get;
39gic.func.icon_get = _icon_get; 39gic.func.content_get = _content_get;
40gic.func.state_get = NULL; 40gic.func.state_get = NULL;
41gic.func.del = NULL; 41gic.func.del = NULL;
42 42
diff --git a/legacy/elementary/src/bin/test_cursor.c b/legacy/elementary/src/bin/test_cursor.c
index f14b80c0a6..17b6302225 100644
--- a/legacy/elementary/src/bin/test_cursor.c
+++ b/legacy/elementary/src/bin/test_cursor.c
@@ -25,7 +25,7 @@ grd_lbl_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__
25} 25}
26 26
27Evas_Object * 27Evas_Object *
28grd_icon_get(void *data, Evas_Object *obj, const char *part) 28grd_content_get(void *data, Evas_Object *obj, const char *part)
29{ 29{
30 const Testitem *ti = data; 30 const Testitem *ti = data;
31 if (!strcmp(part, "elm.swallow.icon")) 31 if (!strcmp(part, "elm.swallow.icon"))
@@ -260,7 +260,7 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
260 260
261 gic.item_style = "default"; 261 gic.item_style = "default";
262 gic.func.label_get = grd_lbl_get; 262 gic.func.label_get = grd_lbl_get;
263 gic.func.icon_get = grd_icon_get; 263 gic.func.content_get = grd_content_get;
264 264
265 n = 0; 265 n = 0;
266 for (i = 0; i < 3 * 3; i++) 266 for (i = 0; i < 3 * 3; i++)
diff --git a/legacy/elementary/src/bin/test_eio.c b/legacy/elementary/src/bin/test_eio.c
index f235ac29a1..def4ced459 100644
--- a/legacy/elementary/src/bin/test_eio.c
+++ b/legacy/elementary/src/bin/test_eio.c
@@ -21,7 +21,7 @@ static void _ls_done_cb(void *data, Eio_File *handler);
21static void _ls_error_cb(void *data, Eio_File *handler, int error); 21static void _ls_error_cb(void *data, Eio_File *handler, int error);
22static void _file_chosen(void *data, Evas_Object *obj, void *event_info); 22static void _file_chosen(void *data, Evas_Object *obj, void *event_info);
23static char *_gl_label_get(void *data, Evas_Object *obj, const char *part); 23static char *_gl_label_get(void *data, Evas_Object *obj, const char *part);
24static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part); 24static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *part);
25static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part); 25static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part);
26static void _gl_del(void *data, Evas_Object *obj); 26static void _gl_del(void *data, Evas_Object *obj);
27static void _test_eio_clear(void *data, Evas_Object *obj, void *event); 27static void _test_eio_clear(void *data, Evas_Object *obj, void *event);
@@ -92,7 +92,7 @@ _gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED
92} 92}
93 93
94static Evas_Object * 94static Evas_Object *
95_gl_icon_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) 95_gl_content_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
96{ 96{
97 return NULL; 97 return NULL;
98} 98}
@@ -121,7 +121,7 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
121 121
122 it_eio.item_style = "default"; 122 it_eio.item_style = "default";
123 it_eio.func.label_get = _gl_label_get; 123 it_eio.func.label_get = _gl_label_get;
124 it_eio.func.icon_get = _gl_icon_get; 124 it_eio.func.content_get = _gl_content_get;
125 it_eio.func.state_get = _gl_state_get; 125 it_eio.func.state_get = _gl_state_get;
126 it_eio.func.del = _gl_del; 126 it_eio.func.del = _gl_del;
127 127
diff --git a/legacy/elementary/src/bin/test_floating.c b/legacy/elementary/src/bin/test_floating.c
index 898466a597..30a09b4487 100644
--- a/legacy/elementary/src/bin/test_floating.c
+++ b/legacy/elementary/src/bin/test_floating.c
@@ -19,7 +19,7 @@ static char *glf_label_get(void *data, Evas_Object *obj __UNUSED__, const char *
19 return strdup(buf); 19 return strdup(buf);
20} 20}
21 21
22static Evas_Object *glf_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) 22static Evas_Object *glf_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
23{ 23{
24 char buf[PATH_MAX]; 24 char buf[PATH_MAX];
25 Evas_Object *ic = elm_icon_add(obj); 25 Evas_Object *ic = elm_icon_add(obj);
@@ -87,7 +87,7 @@ test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
87 87
88 itc1.item_style = "default"; 88 itc1.item_style = "default";
89 itc1.func.label_get = glf_label_get; 89 itc1.func.label_get = glf_label_get;
90 itc1.func.icon_get = glf_icon_get; 90 itc1.func.content_get = glf_content_get;
91 itc1.func.state_get = glf_state_get; 91 itc1.func.state_get = glf_state_get;
92 itc1.func.del = glf_del; 92 itc1.func.del = glf_del;
93 93
diff --git a/legacy/elementary/src/bin/test_gengrid.c b/legacy/elementary/src/bin/test_gengrid.c
index a3705a1c1f..4af9d283c5 100644
--- a/legacy/elementary/src/bin/test_gengrid.c
+++ b/legacy/elementary/src/bin/test_gengrid.c
@@ -105,7 +105,7 @@ grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSE
105} 105}
106 106
107Evas_Object * 107Evas_Object *
108grid_icon_get(void *data, Evas_Object *obj, const char *part) 108grid_content_get(void *data, Evas_Object *obj, const char *part)
109{ 109{
110 const Testitem *ti = data; 110 const Testitem *ti = data;
111 if (!strcmp(part, "elm.swallow.icon")) 111 if (!strcmp(part, "elm.swallow.icon"))
@@ -182,7 +182,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
182 182
183 gic.item_style = "default"; 183 gic.item_style = "default";
184 gic.func.label_get = grid_label_get; 184 gic.func.label_get = grid_label_get;
185 gic.func.icon_get = grid_icon_get; 185 gic.func.content_get = grid_content_get;
186 gic.func.state_get = grid_state_get; 186 gic.func.state_get = grid_state_get;
187 gic.func.del = grid_del; 187 gic.func.del = grid_del;
188 188
@@ -374,7 +374,7 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
374 374
375 gic.item_style = "default"; 375 gic.item_style = "default";
376 gic.func.label_get = grid_label_get; 376 gic.func.label_get = grid_label_get;
377 gic.func.icon_get = grid_icon_get; 377 gic.func.content_get = grid_content_get;
378 gic.func.state_get = grid_state_get; 378 gic.func.state_get = grid_state_get;
379 gic.func.del = grid_del; 379 gic.func.del = grid_del;
380 380
@@ -419,13 +419,13 @@ test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
419 419
420 gic.item_style = "default"; 420 gic.item_style = "default";
421 gic.func.label_get = grid_label_get; 421 gic.func.label_get = grid_label_get;
422 gic.func.icon_get = grid_icon_get; 422 gic.func.content_get = grid_content_get;
423 gic.func.state_get = grid_state_get; 423 gic.func.state_get = grid_state_get;
424 gic.func.del = grid_del; 424 gic.func.del = grid_del;
425 425
426 ggic.item_style = "group_index"; 426 ggic.item_style = "group_index";
427 ggic.func.label_get = grid_label_get; 427 ggic.func.label_get = grid_label_get;
428 ggic.func.icon_get = NULL; 428 ggic.func.content_get = NULL;
429 ggic.func.state_get = NULL; 429 ggic.func.state_get = NULL;
430 ggic.func.del = NULL; 430 ggic.func.del = NULL;
431 431
diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c
index 05e14a4025..dd8e5bb327 100644
--- a/legacy/elementary/src/bin/test_genlist.c
+++ b/legacy/elementary/src/bin/test_genlist.c
@@ -28,7 +28,7 @@ char *gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __U
28 return strdup(buf); 28 return strdup(buf);
29} 29}
30 30
31Evas_Object *gl_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 31Evas_Object *gl_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
32{ 32{
33 char buf[PATH_MAX]; 33 char buf[PATH_MAX];
34 Evas_Object *ic = elm_icon_add(obj); 34 Evas_Object *ic = elm_icon_add(obj);
@@ -142,7 +142,7 @@ test_genlist(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
142 142
143 itc1.item_style = "default"; 143 itc1.item_style = "default";
144 itc1.func.label_get = gl_label_get; 144 itc1.func.label_get = gl_label_get;
145 itc1.func.icon_get = gl_icon_get; 145 itc1.func.content_get = gl_content_get;
146 itc1.func.state_get = gl_state_get; 146 itc1.func.state_get = gl_state_get;
147 itc1.func.del = gl_del; 147 itc1.func.del = gl_del;
148 148
@@ -190,7 +190,7 @@ my_gl_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
190 190
191 itc1.item_style = "default"; 191 itc1.item_style = "default";
192 itc1.func.label_get = gl_label_get; 192 itc1.func.label_get = gl_label_get;
193 itc1.func.icon_get = gl_icon_get; 193 itc1.func.content_get = gl_content_get;
194 itc1.func.state_get = gl_state_get; 194 itc1.func.state_get = gl_state_get;
195 itc1.func.del = gl_del; 195 itc1.func.del = gl_del;
196 196
@@ -212,7 +212,7 @@ my_gl_insert_before(void *data, Evas_Object *obj __UNUSED__, void *event_info __
212 212
213 itc1.item_style = "default"; 213 itc1.item_style = "default";
214 itc1.func.label_get = gl_label_get; 214 itc1.func.label_get = gl_label_get;
215 itc1.func.icon_get = gl_icon_get; 215 itc1.func.content_get = gl_content_get;
216 itc1.func.state_get = gl_state_get; 216 itc1.func.state_get = gl_state_get;
217 itc1.func.del = gl_del; 217 itc1.func.del = gl_del;
218 218
@@ -242,7 +242,7 @@ my_gl_insert_after(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
242 242
243 itc1.item_style = "default"; 243 itc1.item_style = "default";
244 itc1.func.label_get = gl_label_get; 244 itc1.func.label_get = gl_label_get;
245 itc1.func.icon_get = gl_icon_get; 245 itc1.func.content_get = gl_content_get;
246 itc1.func.state_get = gl_state_get; 246 itc1.func.state_get = gl_state_get;
247 itc1.func.del = gl_del; 247 itc1.func.del = gl_del;
248 248
@@ -369,7 +369,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
369 369
370 itc1.item_style = "default"; 370 itc1.item_style = "default";
371 itc1.func.label_get = gl_label_get; 371 itc1.func.label_get = gl_label_get;
372 itc1.func.icon_get = gl_icon_get; 372 itc1.func.content_get = gl_content_get;
373 itc1.func.state_get = gl_state_get; 373 itc1.func.state_get = gl_state_get;
374 itc1.func.del = gl_del; 374 itc1.func.del = gl_del;
375 375
@@ -519,7 +519,7 @@ char *gl2_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __
519 snprintf(buf, sizeof(buf), "Item mode %i", tit->mode); 519 snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
520 return strdup(buf); 520 return strdup(buf);
521} 521}
522Evas_Object *gl2_icon_get(void *data, Evas_Object *obj, const char *part) 522Evas_Object *gl2_content_get(void *data, Evas_Object *obj, const char *part)
523{ 523{
524 const Testitem *tit = data; 524 const Testitem *tit = data;
525 char buf[PATH_MAX]; 525 char buf[PATH_MAX];
@@ -594,7 +594,7 @@ test_genlist3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
594 594
595 itc2.item_style = "default"; 595 itc2.item_style = "default";
596 itc2.func.label_get = gl2_label_get; 596 itc2.func.label_get = gl2_label_get;
597 itc2.func.icon_get = gl2_icon_get; 597 itc2.func.content_get = gl2_content_get;
598 itc2.func.state_get = gl2_state_get; 598 itc2.func.state_get = gl2_state_get;
599 itc2.func.del = gl2_del; 599 itc2.func.del = gl2_del;
600 600
@@ -669,7 +669,7 @@ char *gl3_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __
669 snprintf(buf, sizeof(buf), "Item mode %i", tit->mode); 669 snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
670 return strdup(buf); 670 return strdup(buf);
671} 671}
672Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part) 672Evas_Object *gl3_content_get(void *data, Evas_Object *obj, const char *part)
673{ 673{
674 const Testitem *tit = data; 674 const Testitem *tit = data;
675 if (!strcmp(part, "elm.swallow.icon")) 675 if (!strcmp(part, "elm.swallow.icon"))
@@ -730,7 +730,7 @@ test_genlist4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
730 730
731 itc3.item_style = "default"; 731 itc3.item_style = "default";
732 itc3.func.label_get = gl3_label_get; 732 itc3.func.label_get = gl3_label_get;
733 itc3.func.icon_get = gl3_icon_get; 733 itc3.func.content_get = gl3_content_get;
734 itc3.func.state_get = gl3_state_get; 734 itc3.func.state_get = gl3_state_get;
735 itc3.func.del = gl3_del; 735 itc3.func.del = gl3_del;
736 736
@@ -812,7 +812,7 @@ char *gl5_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
812 } 812 }
813 return strdup(buf); 813 return strdup(buf);
814} 814}
815Evas_Object *gl5_icon_get(void *data, Evas_Object *obj, const char *part) 815Evas_Object *gl5_content_get(void *data, Evas_Object *obj, const char *part)
816{ 816{
817 const Testitem *tit = data; 817 const Testitem *tit = data;
818 char buf[PATH_MAX]; 818 char buf[PATH_MAX];
@@ -949,7 +949,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
949 evas_object_show(gl); 949 evas_object_show(gl);
950 itc5.item_style = "double_label"; 950 itc5.item_style = "double_label";
951 itc5.func.label_get = gl5_label_get; 951 itc5.func.label_get = gl5_label_get;
952 itc5.func.icon_get = gl5_icon_get; 952 itc5.func.content_get = gl5_content_get;
953 itc5.func.state_get = gl5_state_get; 953 itc5.func.state_get = gl5_state_get;
954 itc5.func.del = gl5_del; 954 itc5.func.del = gl5_del;
955 955
@@ -1078,7 +1078,7 @@ char *gl4_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __
1078 snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data); 1078 snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data);
1079 return strdup(buf); 1079 return strdup(buf);
1080} 1080}
1081Evas_Object *gl4_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 1081Evas_Object *gl4_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
1082{ 1082{
1083 char buf[PATH_MAX]; 1083 char buf[PATH_MAX];
1084 if (!strcmp(part, "elm.swallow.icon")) 1084 if (!strcmp(part, "elm.swallow.icon"))
@@ -1134,7 +1134,7 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
1134 1134
1135 itc4.item_style = "default"; 1135 itc4.item_style = "default";
1136 itc4.func.label_get = gl4_label_get; 1136 itc4.func.label_get = gl4_label_get;
1137 itc4.func.icon_get = gl4_icon_get; 1137 itc4.func.content_get = gl4_content_get;
1138 itc4.func.state_get = gl4_state_get; 1138 itc4.func.state_get = gl4_state_get;
1139 itc4.func.del = gl4_del; 1139 itc4.func.del = gl4_del;
1140 1140
@@ -1288,13 +1288,13 @@ test_genlist7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
1288 1288
1289 itc2.item_style = "default"; 1289 itc2.item_style = "default";
1290 itc2.func.label_get = gl2_label_get; 1290 itc2.func.label_get = gl2_label_get;
1291 itc2.func.icon_get = gl2_icon_get; 1291 itc2.func.content_get = gl2_content_get;
1292 itc2.func.state_get = gl2_state_get; 1292 itc2.func.state_get = gl2_state_get;
1293 itc2.func.del = gl2_del; 1293 itc2.func.del = gl2_del;
1294 1294
1295 itc7.item_style = "double_label"; 1295 itc7.item_style = "double_label";
1296 itc7.func.label_get = gl5_label_get; 1296 itc7.func.label_get = gl5_label_get;
1297 itc7.func.icon_get = gl5_icon_get; 1297 itc7.func.content_get = gl5_content_get;
1298 itc7.func.state_get = gl5_state_get; 1298 itc7.func.state_get = gl5_state_get;
1299 itc7.func.del = gl5_del; 1299 itc7.func.del = gl5_del;
1300 1300
@@ -1375,13 +1375,13 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
1375 1375
1376 itc1.item_style = "default"; 1376 itc1.item_style = "default";
1377 itc1.func.label_get = gl_label_get; 1377 itc1.func.label_get = gl_label_get;
1378 itc1.func.icon_get = gl_icon_get; 1378 itc1.func.content_get = gl_content_get;
1379 itc1.func.state_get = gl_state_get; 1379 itc1.func.state_get = gl_state_get;
1380 itc1.func.del = gl_del; 1380 itc1.func.del = gl_del;
1381 1381
1382 itc_group.item_style = "group_index"; 1382 itc_group.item_style = "group_index";
1383 itc_group.func.label_get = gl8_label_get; 1383 itc_group.func.label_get = gl8_label_get;
1384 itc_group.func.icon_get = NULL; 1384 itc_group.func.content_get = NULL;
1385 itc_group.func.state_get = NULL; 1385 itc_group.func.state_get = NULL;
1386 itc_group.func.del = gl_del; 1386 itc_group.func.del = gl_del;
1387 1387
@@ -1586,13 +1586,13 @@ test_genlist9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
1586 1586
1587 itc1.item_style = "default"; 1587 itc1.item_style = "default";
1588 itc1.func.label_get = gl_label_get; 1588 itc1.func.label_get = gl_label_get;
1589 itc1.func.icon_get = gl_icon_get; 1589 itc1.func.content_get = gl_content_get;
1590 itc1.func.state_get = gl_state_get; 1590 itc1.func.state_get = gl_state_get;
1591 itc1.func.del = gl_del; 1591 itc1.func.del = gl_del;
1592 1592
1593 itc_group.item_style = "group_index"; 1593 itc_group.item_style = "group_index";
1594 itc_group.func.label_get = gl8_label_get; 1594 itc_group.func.label_get = gl8_label_get;
1595 itc_group.func.icon_get = NULL; 1595 itc_group.func.content_get = NULL;
1596 itc_group.func.state_get = NULL; 1596 itc_group.func.state_get = NULL;
1597 itc_group.func.del = gl_del; 1597 itc_group.func.del = gl_del;
1598 1598
@@ -1646,7 +1646,7 @@ char *gl10_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
1646 return strdup(buf); 1646 return strdup(buf);
1647} 1647}
1648 1648
1649Evas_Object *gl10_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 1649Evas_Object *gl10_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
1650{ 1650{
1651 char buf[PATH_MAX]; 1651 char buf[PATH_MAX];
1652 Evas_Object *ic = elm_icon_add(obj); 1652 Evas_Object *ic = elm_icon_add(obj);
@@ -1764,7 +1764,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
1764 1764
1765 itc10.item_style = "default"; 1765 itc10.item_style = "default";
1766 itc10.func.label_get = gl10_label_get; 1766 itc10.func.label_get = gl10_label_get;
1767 itc10.func.icon_get = gl10_icon_get; 1767 itc10.func.content_get = gl10_content_get;
1768 itc10.func.state_get = gl_state_get; 1768 itc10.func.state_get = gl_state_get;
1769 itc10.func.del = gl_del; 1769 itc10.func.del = gl_del;
1770 elm_genlist_mode_item_style_set(gl, "mode"); 1770 elm_genlist_mode_item_style_set(gl, "mode");
@@ -1859,7 +1859,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
1859 1859
1860 itc1.item_style = "default"; 1860 itc1.item_style = "default";
1861 itc1.func.label_get = gl_label_get; 1861 itc1.func.label_get = gl_label_get;
1862 itc1.func.icon_get = gl_icon_get; 1862 itc1.func.content_get = gl_content_get;
1863 itc1.func.state_get = gl_state_get; 1863 itc1.func.state_get = gl_state_get;
1864 itc1.func.del = gl_del; 1864 itc1.func.del = gl_del;
1865 evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl); 1865 evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl);
@@ -1914,7 +1914,7 @@ test_genlist12(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
1914 1914
1915 itc1.item_style = "message"; 1915 itc1.item_style = "message";
1916 itc1.func.label_get = gl12_label_get; 1916 itc1.func.label_get = gl12_label_get;
1917 itc1.func.icon_get = gl_icon_get; 1917 itc1.func.content_get = gl_content_get;
1918 itc1.func.state_get = gl_state_get; 1918 itc1.func.state_get = gl_state_get;
1919 itc1.func.del = gl_del; 1919 itc1.func.del = gl_del;
1920 1920
diff --git a/legacy/elementary/src/bin/test_icon_desktops.c b/legacy/elementary/src/bin/test_icon_desktops.c
index 3a350819fa..ce19faad47 100644
--- a/legacy/elementary/src/bin/test_icon_desktops.c
+++ b/legacy/elementary/src/bin/test_icon_desktops.c
@@ -17,7 +17,7 @@ desk_gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UN
17#endif 17#endif
18} 18}
19static Evas_Object * 19static Evas_Object *
20desk_gl_icon_get(void *data, Evas_Object *obj, const char *part) 20desk_gl_content_get(void *data, Evas_Object *obj, const char *part)
21{ 21{
22#ifdef ELM_EFREET 22#ifdef ELM_EFREET
23 Efreet_Desktop *d = (Efreet_Desktop *)data; 23 Efreet_Desktop *d = (Efreet_Desktop *)data;
@@ -75,7 +75,7 @@ test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
75 75
76 it_desk.item_style = "default"; 76 it_desk.item_style = "default";
77 it_desk.func.label_get = desk_gl_label_get; 77 it_desk.func.label_get = desk_gl_label_get;
78 it_desk.func.icon_get = desk_gl_icon_get; 78 it_desk.func.content_get = desk_gl_content_get;
79 it_desk.func.state_get = NULL; 79 it_desk.func.state_get = NULL;
80 it_desk.func.del = desk_gl_del; 80 it_desk.func.del = desk_gl_del;
81 81
diff --git a/legacy/elementary/src/bin/test_index.c b/legacy/elementary/src/bin/test_index.c
index a7a938b941..07eb6bd1ab 100644
--- a/legacy/elementary/src/bin/test_index.c
+++ b/legacy/elementary/src/bin/test_index.c
@@ -66,7 +66,7 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
66 66
67 itci.item_style = "default"; 67 itci.item_style = "default";
68 itci.func.label_get = gli_label_get; 68 itci.func.label_get = gli_label_get;
69 itci.func.icon_get = NULL; 69 itci.func.content_get = NULL;
70 itci.func.state_get = NULL; 70 itci.func.state_get = NULL;
71 itci.func.del = NULL; 71 itci.func.del = NULL;
72 72
diff --git a/legacy/elementary/src/bin/test_panel.c b/legacy/elementary/src/bin/test_panel.c
index 7f98804d47..adfaa2b1e2 100644
--- a/legacy/elementary/src/bin/test_panel.c
+++ b/legacy/elementary/src/bin/test_panel.c
@@ -9,7 +9,7 @@ static Elm_Genlist_Item_Class itc;
9static void _bstatus(void *data, Evas_Object *obj, void *event_info); 9static void _bstatus(void *data, Evas_Object *obj, void *event_info);
10static void _tstatus(void *data, Evas_Object *obj, void *event_info); 10static void _tstatus(void *data, Evas_Object *obj, void *event_info);
11static char *_label_get(void *data, Evas_Object *obj, const char *source); 11static char *_label_get(void *data, Evas_Object *obj, const char *source);
12static Evas_Object *_icon_get(void *data, Evas_Object *obj, const char *source); 12static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *source);
13static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *source); 13static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *source);
14static void _item_del(void *data, Evas_Object *obj); 14static void _item_del(void *data, Evas_Object *obj);
15static void _fill_list(Evas_Object *obj); 15static void _fill_list(Evas_Object *obj);
@@ -52,7 +52,7 @@ _label_get(void *data, Evas_Object *obj __UNUSED__, const char *source __UNUSED_
52} 52}
53 53
54static Evas_Object * 54static Evas_Object *
55_icon_get(void *data, Evas_Object *obj, const char *source) 55_content_get(void *data, Evas_Object *obj, const char *source)
56{ 56{
57 if (!strcmp(source, "elm.swallow.icon")) 57 if (!strcmp(source, "elm.swallow.icon"))
58 { 58 {
@@ -199,7 +199,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
199 199
200 itc.item_style = "default"; 200 itc.item_style = "default";
201 itc.func.label_get = _label_get; 201 itc.func.label_get = _label_get;
202 itc.func.icon_get = _icon_get; 202 itc.func.content_get = _content_get;
203 itc.func.state_get = _state_get; 203 itc.func.state_get = _state_get;
204 itc.func.del = _item_del; 204 itc.func.del = _item_del;
205 205
diff --git a/legacy/elementary/src/bin/test_tooltip.c b/legacy/elementary/src/bin/test_tooltip.c
index dc1d8220e7..8e0bc12e15 100644
--- a/legacy/elementary/src/bin/test_tooltip.c
+++ b/legacy/elementary/src/bin/test_tooltip.c
@@ -26,7 +26,7 @@ grdt_lbl_get(void *data,
26} 26}
27 27
28Evas_Object * 28Evas_Object *
29grdt_icon_get(void *data, 29grdt_content_get(void *data,
30 Evas_Object *obj, 30 Evas_Object *obj,
31 const char *part) 31 const char *part)
32{ 32{
@@ -548,7 +548,7 @@ test_tooltip2(void *data __UNUSED__,
548 548
549 gic.item_style = "default"; 549 gic.item_style = "default";
550 gic.func.label_get = grdt_lbl_get; 550 gic.func.label_get = grdt_lbl_get;
551 gic.func.icon_get = grdt_icon_get; 551 gic.func.content_get = grdt_content_get;
552 552
553 n = 0; 553 n = 0;
554 for (i = 0; i < 9; i++) 554 for (i = 0; i < 9; i++)
diff --git a/legacy/elementary/src/examples/entry_example.c b/legacy/elementary/src/examples/entry_example.c
index 10bbca8873..5d14a184c0 100644
--- a/legacy/elementary/src/examples/entry_example.c
+++ b/legacy/elementary/src/examples/entry_example.c
@@ -55,7 +55,7 @@ _emo_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSE
55} 55}
56 56
57static Evas_Object * 57static Evas_Object *
58_emo_icon_get(void *data, Evas_Object *obj, const char *part) 58_emo_content_get(void *data, Evas_Object *obj, const char *part)
59{ 59{
60 Evas_Object *o; 60 Evas_Object *o;
61 61
@@ -82,7 +82,7 @@ _page_grid_add(Evas_Object *parent, App_Inwin_Data *aid)
82 "default", 82 "default",
83 { 83 {
84 _emo_label_get, 84 _emo_label_get,
85 _emo_icon_get, 85 _emo_content_get,
86 NULL, 86 NULL,
87 _emo_del 87 _emo_del
88 } 88 }
diff --git a/legacy/elementary/src/examples/gengrid_example.c b/legacy/elementary/src/examples/gengrid_example.c
index c68e5e52f7..1b2e72005d 100644
--- a/legacy/elementary/src/examples/gengrid_example.c
+++ b/legacy/elementary/src/examples/gengrid_example.c
@@ -313,7 +313,7 @@ _grid_label_get(void *data,
313 313
314/* icon fetching callback */ 314/* icon fetching callback */
315static Evas_Object * 315static Evas_Object *
316_grid_icon_get(void *data, 316_grid_content_get(void *data,
317 Evas_Object *obj, 317 Evas_Object *obj,
318 const char *part) 318 const char *part)
319{ 319{
@@ -606,7 +606,7 @@ elm_main(int argc __UNUSED__,
606 606
607 gic.item_style = "default"; 607 gic.item_style = "default";
608 gic.func.label_get = _grid_label_get; 608 gic.func.label_get = _grid_label_get;
609 gic.func.icon_get = _grid_icon_get; 609 gic.func.content_get = _grid_icon_get;
610 gic.func.state_get = _grid_state_get; 610 gic.func.state_get = _grid_state_get;
611 gic.func.del = _grid_del; 611 gic.func.del = _grid_del;
612 612
diff --git a/legacy/elementary/src/examples/genlist_example_01.c b/legacy/elementary/src/examples/genlist_example_01.c
index ecad6a0a82..cc7042fff9 100644
--- a/legacy/elementary/src/examples/genlist_example_01.c
+++ b/legacy/elementary/src/examples/genlist_example_01.c
@@ -21,7 +21,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUS
21} 21}
22 22
23static Evas_Object * 23static Evas_Object *
24_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 24_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
25{ 25{
26 Evas_Object *ic = elm_icon_add(obj); 26 Evas_Object *ic = elm_icon_add(obj);
27 27
@@ -59,7 +59,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
59 59
60 _itc.item_style = "default"; 60 _itc.item_style = "default";
61 _itc.func.label_get = _item_label_get; 61 _itc.func.label_get = _item_label_get;
62 _itc.func.icon_get = _item_icon_get; 62 _itc.func.content_get = _item_icon_get;
63 _itc.func.state_get = NULL; 63 _itc.func.state_get = NULL;
64 _itc.func.del = NULL; 64 _itc.func.del = NULL;
65 65
diff --git a/legacy/elementary/src/examples/genlist_example_02.c b/legacy/elementary/src/examples/genlist_example_02.c
index da8f46b3b1..613c84b31e 100644
--- a/legacy/elementary/src/examples/genlist_example_02.c
+++ b/legacy/elementary/src/examples/genlist_example_02.c
@@ -32,7 +32,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUS
32} 32}
33 33
34static Evas_Object * 34static Evas_Object *
35_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 35_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
36{ 36{
37 Evas_Object *ic = elm_icon_add(obj); 37 Evas_Object *ic = elm_icon_add(obj);
38 38
@@ -116,7 +116,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
116 116
117 _itc.item_style = "default"; 117 _itc.item_style = "default";
118 _itc.func.label_get = _item_label_get; 118 _itc.func.label_get = _item_label_get;
119 _itc.func.icon_get = _item_icon_get; 119 _itc.func.content_get = _item_icon_get;
120 _itc.func.state_get = NULL; 120 _itc.func.state_get = NULL;
121 _itc.func.del = NULL; 121 _itc.func.del = NULL;
122 122
diff --git a/legacy/elementary/src/examples/genlist_example_03.c b/legacy/elementary/src/examples/genlist_example_03.c
index fe31ade32e..712f778763 100644
--- a/legacy/elementary/src/examples/genlist_example_03.c
+++ b/legacy/elementary/src/examples/genlist_example_03.c
@@ -33,7 +33,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
33} 33}
34 34
35static Evas_Object * 35static Evas_Object *
36_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 36_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
37{ 37{
38 Evas_Object *ic = elm_icon_add(obj); 38 Evas_Object *ic = elm_icon_add(obj);
39 39
@@ -104,7 +104,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
104 104
105 _itc.item_style = "double_label"; 105 _itc.item_style = "double_label";
106 _itc.func.label_get = _item_label_get; 106 _itc.func.label_get = _item_label_get;
107 _itc.func.icon_get = _item_icon_get; 107 _itc.func.content_get = _item_icon_get;
108 _itc.func.state_get = NULL; 108 _itc.func.state_get = NULL;
109 _itc.func.del = NULL; 109 _itc.func.del = NULL;
110 110
diff --git a/legacy/elementary/src/examples/genlist_example_04.c b/legacy/elementary/src/examples/genlist_example_04.c
index a06fc02f63..bb309e1564 100644
--- a/legacy/elementary/src/examples/genlist_example_04.c
+++ b/legacy/elementary/src/examples/genlist_example_04.c
@@ -35,7 +35,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
35} 35}
36 36
37static Evas_Object * 37static Evas_Object *
38_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 38_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
39{ 39{
40 Evas_Object *ic = elm_icon_add(obj); 40 Evas_Object *ic = elm_icon_add(obj);
41 41
@@ -65,7 +65,7 @@ _group_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNU
65} 65}
66 66
67static Evas_Object * 67static Evas_Object *
68_group_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) 68_group_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
69{ 69{
70 Evas_Object *ic = elm_icon_add(obj); 70 Evas_Object *ic = elm_icon_add(obj);
71 71
@@ -289,13 +289,13 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
289 289
290 _itc.item_style = "double_label"; 290 _itc.item_style = "double_label";
291 _itc.func.label_get = _item_label_get; 291 _itc.func.label_get = _item_label_get;
292 _itc.func.icon_get = _item_icon_get; 292 _itc.func.content_get = _item_icon_get;
293 _itc.func.state_get = NULL; 293 _itc.func.state_get = NULL;
294 _itc.func.del = NULL; 294 _itc.func.del = NULL;
295 295
296 _itc_group.item_style = "group_index"; 296 _itc_group.item_style = "group_index";
297 _itc_group.func.label_get = _group_label_get; 297 _itc_group.func.label_get = _group_label_get;
298 _itc_group.func.icon_get = _group_icon_get; 298 _itc_group.func.content_get = _group_icon_get;
299 _itc_group.func.state_get = NULL; 299 _itc_group.func.state_get = NULL;
300 _itc_group.func.del = NULL; 300 _itc_group.func.del = NULL;
301 301
diff --git a/legacy/elementary/src/examples/genlist_example_05.c b/legacy/elementary/src/examples/genlist_example_05.c
index 66da41256a..5c4b38981f 100644
--- a/legacy/elementary/src/examples/genlist_example_05.c
+++ b/legacy/elementary/src/examples/genlist_example_05.c
@@ -35,7 +35,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
35} 35}
36 36
37static Evas_Object * 37static Evas_Object *
38_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 38_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
39{ 39{
40 Evas_Object *ic = elm_icon_add(obj); 40 Evas_Object *ic = elm_icon_add(obj);
41 41
@@ -66,7 +66,7 @@ _parent_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UN
66} 66}
67 67
68static Evas_Object * 68static Evas_Object *
69_parent_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) 69_parent_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
70{ 70{
71 Evas_Object *ic = elm_icon_add(obj); 71 Evas_Object *ic = elm_icon_add(obj);
72 72
@@ -90,7 +90,7 @@ _favorite_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
90} 90}
91 91
92static Evas_Object * 92static Evas_Object *
93_favorite_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) 93_favorite_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
94{ 94{
95 Evas_Object *ic = elm_icon_add(obj); 95 Evas_Object *ic = elm_icon_add(obj);
96 96
@@ -337,19 +337,19 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
337 337
338 _itc.item_style = "default"; 338 _itc.item_style = "default";
339 _itc.func.label_get = _item_label_get; 339 _itc.func.label_get = _item_label_get;
340 _itc.func.icon_get = _item_icon_get; 340 _itc.func.content_get = _item_icon_get;
341 _itc.func.state_get = NULL; 341 _itc.func.state_get = NULL;
342 _itc.func.del = NULL; 342 _itc.func.del = NULL;
343 343
344 _itp.item_style = "default"; 344 _itp.item_style = "default";
345 _itp.func.label_get = _parent_label_get; 345 _itp.func.label_get = _parent_label_get;
346 _itp.func.icon_get = _parent_icon_get; 346 _itp.func.content_get = _parent_icon_get;
347 _itp.func.state_get = NULL; 347 _itp.func.state_get = NULL;
348 _itp.func.del = NULL; 348 _itp.func.del = NULL;
349 349
350 _itfav.item_style = "default"; 350 _itfav.item_style = "default";
351 _itfav.func.label_get = _favorite_label_get; 351 _itfav.func.label_get = _favorite_label_get;
352 _itfav.func.icon_get = _favorite_icon_get; 352 _itfav.func.content_get = _favorite_icon_get;
353 _itfav.func.state_get = NULL; 353 _itfav.func.state_get = NULL;
354 _itfav.func.del = NULL; 354 _itfav.func.del = NULL;
355 355
diff --git a/legacy/elementary/src/examples/index_example_02.c b/legacy/elementary/src/examples/index_example_02.c
index 2b9733f41e..6f41e518fa 100644
--- a/legacy/elementary/src/examples/index_example_02.c
+++ b/legacy/elementary/src/examples/index_example_02.c
@@ -55,7 +55,7 @@ _grid_label_get(void *data,
55} 55}
56 56
57Evas_Object * 57Evas_Object *
58_grid_icon_get(void *data __UNUSED__, 58_grid_content_get(void *data __UNUSED__,
59 Evas_Object *obj, 59 Evas_Object *obj,
60 const char *part) 60 const char *part)
61{ 61{
@@ -116,7 +116,7 @@ elm_main(int argc __UNUSED__,
116 116
117 gic.item_style = "default"; 117 gic.item_style = "default";
118 gic.func.label_get = _grid_label_get; 118 gic.func.label_get = _grid_label_get;
119 gic.func.icon_get = _grid_icon_get; 119 gic.func.content_get = _grid_icon_get;
120 gic.func.state_get = NULL; 120 gic.func.state_get = NULL;
121 gic.func.del = NULL; 121 gic.func.del = NULL;
122 122
diff --git a/legacy/elementary/src/examples/map_example_02.c b/legacy/elementary/src/examples/map_example_02.c
index fdeab9ea41..7557f2028f 100644
--- a/legacy/elementary/src/examples/map_example_02.c
+++ b/legacy/elementary/src/examples/map_example_02.c
@@ -57,7 +57,7 @@ _marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data)
57} 57}
58 58
59static Evas_Object * 59static Evas_Object *
60_marker_city_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__) 60_marker_city_content_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__)
61{ 61{
62 Evas_Object *icon = elm_icon_add(obj); 62 Evas_Object *icon = elm_icon_add(obj);
63 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_07.png", NULL); 63 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_07.png", NULL);
@@ -67,7 +67,7 @@ _marker_city_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void
67} 67}
68 68
69static Evas_Object * 69static Evas_Object *
70_group_city_icon_get(Evas_Object *obj, void *data __UNUSED__) 70_group_city_content_get(Evas_Object *obj, void *data __UNUSED__)
71{ 71{
72 Evas_Object *icon = elm_icon_add(obj); 72 Evas_Object *icon = elm_icon_add(obj);
73 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_05.png", NULL); 73 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_05.png", NULL);
@@ -76,7 +76,7 @@ _group_city_icon_get(Evas_Object *obj, void *data __UNUSED__)
76} 76}
77 77
78static Evas_Object * 78static Evas_Object *
79_marker_country_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__) 79_marker_country_content_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__)
80{ 80{
81 Evas_Object *icon = elm_icon_add(obj); 81 Evas_Object *icon = elm_icon_add(obj);
82 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_06.png", NULL); 82 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_06.png", NULL);
@@ -85,7 +85,7 @@ _marker_country_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, vo
85} 85}
86 86
87static Evas_Object * 87static Evas_Object *
88_group_country_icon_get(Evas_Object *obj, void *data __UNUSED__) 88_group_country_content_get(Evas_Object *obj, void *data __UNUSED__)
89{ 89{
90 Evas_Object *icon = elm_icon_add(obj); 90 Evas_Object *icon = elm_icon_add(obj);
91 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_04.png", NULL); 91 elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_04.png", NULL);
@@ -207,22 +207,22 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
207 207
208 mc_city = elm_map_marker_class_new(map); 208 mc_city = elm_map_marker_class_new(map);
209 elm_map_marker_class_get_cb_set(mc_city, _marker_get); 209 elm_map_marker_class_get_cb_set(mc_city, _marker_get);
210 elm_map_marker_class_icon_cb_set(mc_city, _marker_city_icon_get); 210 elm_map_marker_class_icon_cb_set(mc_city, _marker_city_content_get);
211 elm_map_marker_class_style_set(mc_city, "radio"); 211 elm_map_marker_class_style_set(mc_city, "radio");
212 212
213 gc_city = elm_map_group_class_new(map); 213 gc_city = elm_map_group_class_new(map);
214 elm_map_group_class_style_set(gc_city, "radio2"); 214 elm_map_group_class_style_set(gc_city, "radio2");
215 elm_map_group_class_icon_cb_set(gc_city, _group_city_icon_get); 215 elm_map_group_class_icon_cb_set(gc_city, _group_city_content_get);
216 elm_map_group_class_zoom_displayed_set(gc_city, 3); 216 elm_map_group_class_zoom_displayed_set(gc_city, 3);
217 217
218 mc_country = elm_map_marker_class_new(map); 218 mc_country = elm_map_marker_class_new(map);
219 elm_map_marker_class_get_cb_set(mc_country, _marker_get); 219 elm_map_marker_class_get_cb_set(mc_country, _marker_get);
220 elm_map_marker_class_icon_cb_set(mc_country, _marker_country_icon_get); 220 elm_map_marker_class_icon_cb_set(mc_country, _marker_country_content_get);
221 elm_map_marker_class_style_set(mc_country, "empty"); 221 elm_map_marker_class_style_set(mc_country, "empty");
222 222
223 gc_country = elm_map_group_class_new(map); 223 gc_country = elm_map_group_class_new(map);
224 elm_map_group_class_style_set(gc_country, "empty"); 224 elm_map_group_class_style_set(gc_country, "empty");
225 elm_map_group_class_icon_cb_set(gc_country, _group_country_icon_get); 225 elm_map_group_class_icon_cb_set(gc_country, _group_country_content_get);
226 elm_map_group_class_zoom_displayed_set(gc_country, 1); 226 elm_map_group_class_zoom_displayed_set(gc_country, 1);
227 227
228 m = elm_map_marker_add(map, -43.2, -22.9, mc_city, gc_city, &data_rio); 228 m = elm_map_marker_add(map, -43.2, -22.9, mc_city, gc_city, &data_rio);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 01019e1b5b..0c7af405ff 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -7899,7 +7899,7 @@ extern "C" {
7899 typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class; 7899 typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class;
7900 typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func; /**< Class functions for gen item classes. */ 7900 typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func; /**< Class functions for gen item classes. */
7901 typedef char *(*Elm_Gen_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gen item classes. */ 7901 typedef char *(*Elm_Gen_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gen item classes. */
7902 typedef Evas_Object *(*Elm_Gen_Item_Icon_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Icon fetching class function for gen item classes. */ 7902 typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Content(swallowed object) fetching class function for gen item classes. */
7903 typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gen item classes. */ 7903 typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gen item classes. */
7904 typedef void (*Elm_Gen_Item_Del_Cb) (void *data, Evas_Object *obj); /**< Deletion class function for gen item classes. */ 7904 typedef void (*Elm_Gen_Item_Del_Cb) (void *data, Evas_Object *obj); /**< Deletion class function for gen item classes. */
7905 struct _Elm_Gen_Item_Class 7905 struct _Elm_Gen_Item_Class
@@ -7908,7 +7908,7 @@ extern "C" {
7908 struct _Elm_Gen_Item_Class_Func 7908 struct _Elm_Gen_Item_Class_Func
7909 { 7909 {
7910 Elm_Gen_Item_Label_Get_Cb label_get; 7910 Elm_Gen_Item_Label_Get_Cb label_get;
7911 Elm_Gen_Item_Icon_Get_Cb icon_get; 7911 Elm_Gen_Item_Content_Get_Cb content_get;
7912 Elm_Gen_Item_State_Get_Cb state_get; 7912 Elm_Gen_Item_State_Get_Cb state_get;
7913 Elm_Gen_Item_Del_Cb del; 7913 Elm_Gen_Item_Del_Cb del;
7914 } func; 7914 } func;
@@ -8010,16 +8010,16 @@ extern "C" {
8010 * item's theme. This function @b must return a strdup'()ed string, 8010 * item's theme. This function @b must return a strdup'()ed string,
8011 * as the caller will free() it when done. See 8011 * as the caller will free() it when done. See
8012 * #Elm_Gengrid_Item_Label_Get_Cb. 8012 * #Elm_Gengrid_Item_Label_Get_Cb.
8013 * - @c func.icon_get - This function is called when an item object 8013 * - @c func.content_get - This function is called when an item object
8014 * is actually created. The @c data parameter will point to the 8014 * is actually created. The @c data parameter will point to the
8015 * same data passed to elm_gengrid_item_append() and related item 8015 * same data passed to elm_gengrid_item_append() and related item
8016 * creation functions. The @c obj parameter is the gengrid object 8016 * creation functions. The @c obj parameter is the gengrid object
8017 * itself, while the @c part one is the name string of one of the 8017 * itself, while the @c part one is the name string of one of the
8018 * existing (icon) swallow parts in the Edje group implementing the 8018 * existing (content) swallow parts in the Edje group implementing the
8019 * item's theme. It must return @c NULL, when no icon is desired, 8019 * item's theme. It must return @c NULL, when no content is desired,
8020 * or a valid object handle, otherwise. The object will be deleted 8020 * or a valid object handle, otherwise. The object will be deleted
8021 * by the gengrid on its deletion or when the item is "unrealized". 8021 * by the gengrid on its deletion or when the item is "unrealized".
8022 * See #Elm_Gengrid_Item_Icon_Get_Cb. 8022 * See #Elm_Gengrid_Item_Content_Get_Cb.
8023 * - @c func.state_get - This function is called when an item 8023 * - @c func.state_get - This function is called when an item
8024 * object is actually created. The @c data parameter will point to 8024 * object is actually created. The @c data parameter will point to
8025 * the same data passed to elm_gengrid_item_append() and related 8025 * the same data passed to elm_gengrid_item_append() and related
@@ -8050,7 +8050,7 @@ extern "C" {
8050 * modified (added, deleted, selected or unselected) of child items 8050 * modified (added, deleted, selected or unselected) of child items
8051 * on a gengrid. 8051 * on a gengrid.
8052 * 8052 *
8053 * If an item changes (internal (boolean) state, label or icon 8053 * If an item changes (internal (boolean) state, label or content
8054 * changes), then use elm_gengrid_item_update() to have gengrid 8054 * changes), then use elm_gengrid_item_update() to have gengrid
8055 * update the item with the new state. A gengrid will re-"realize" 8055 * update the item with the new state. A gengrid will re-"realize"
8056 * the item, thus calling the functions in the 8056 * the item, thus calling the functions in the
@@ -8151,7 +8151,7 @@ extern "C" {
8151 #define Elm_Gengrid_Item Elm_Gen_Item /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */ 8151 #define Elm_Gengrid_Item Elm_Gen_Item /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */
8152 typedef struct _Elm_Gengrid_Item_Class_Func Elm_Gengrid_Item_Class_Func; /**< Class functions for gengrid item classes. */ 8152 typedef struct _Elm_Gengrid_Item_Class_Func Elm_Gengrid_Item_Class_Func; /**< Class functions for gengrid item classes. */
8153 typedef char *(*Elm_Gengrid_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gengrid item classes. */ 8153 typedef char *(*Elm_Gengrid_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gengrid item classes. */
8154 typedef Evas_Object *(*Elm_Gengrid_Item_Icon_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Icon fetching class function for gengrid item classes. */ 8154 typedef Evas_Object *(*Elm_Gengrid_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Content (swallowed object) fetching class function for gengrid item classes. */
8155 typedef Eina_Bool (*Elm_Gengrid_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gengrid item classes. */ 8155 typedef Eina_Bool (*Elm_Gengrid_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gengrid item classes. */
8156 typedef void (*Elm_Gengrid_Item_Del_Cb) (void *data, Evas_Object *obj); /**< Deletion class function for gengrid item classes. */ 8156 typedef void (*Elm_Gengrid_Item_Del_Cb) (void *data, Evas_Object *obj); /**< Deletion class function for gengrid item classes. */
8157 8157
@@ -8167,7 +8167,7 @@ extern "C" {
8167 struct _Elm_Gengrid_Item_Class_Func 8167 struct _Elm_Gengrid_Item_Class_Func
8168 { 8168 {
8169 Elm_Gengrid_Item_Label_Get_Cb label_get; 8169 Elm_Gengrid_Item_Label_Get_Cb label_get;
8170 Elm_Gengrid_Item_Icon_Get_Cb icon_get; 8170 Elm_Gengrid_Item_Content_Get_Cb content_get;
8171 Elm_Gengrid_Item_State_Get_Cb state_get; 8171 Elm_Gengrid_Item_State_Get_Cb state_get;
8172 Elm_Gengrid_Item_Del_Cb del; 8172 Elm_Gengrid_Item_Del_Cb del;
8173 } func; 8173 } func;
@@ -8873,7 +8873,7 @@ extern "C" {
8873 * @param item The gengrid item 8873 * @param item The gengrid item
8874 * 8874 *
8875 * This updates an item by calling all the item class functions 8875 * This updates an item by calling all the item class functions
8876 * again to get the icons, labels and states. Use this when the 8876 * again to get the contents, labels and states. Use this when the
8877 * original item data has changed and you want thta changes to be 8877 * original item data has changed and you want thta changes to be
8878 * reflected. 8878 * reflected.
8879 * 8879 *
@@ -17859,9 +17859,9 @@ extern "C" {
17859 * existing text parts in the Edje group implementing the item's theme. 17859 * existing text parts in the Edje group implementing the item's theme.
17860 * This function @b must return a strdup'()ed string, as the caller will 17860 * This function @b must return a strdup'()ed string, as the caller will
17861 * free() it when done. See #Elm_Genlist_Item_Label_Get_Cb. 17861 * free() it when done. See #Elm_Genlist_Item_Label_Get_Cb.
17862 * - @c icon_get - The @c part parameter is the name string of one of the 17862 * - @c content_get - The @c part parameter is the name string of one of the
17863 * existing (icon) swallow parts in the Edje group implementing the item's 17863 * existing (content) swallow parts in the Edje group implementing the item's
17864 * theme. It must return @c NULL, when no icon is desired, or a valid 17864 * theme. It must return @c NULL, when no content is desired, or a valid
17865 * object handle, otherwise. The object will be deleted by the genlist on 17865 * object handle, otherwise. The object will be deleted by the genlist on
17866 * its deletion or when the item is "unrealized". See 17866 * its deletion or when the item is "unrealized". See
17867 * #Elm_Genlist_Item_Icon_Get_Cb. 17867 * #Elm_Genlist_Item_Icon_Get_Cb.
@@ -17902,15 +17902,15 @@ extern "C" {
17902 * 17902 *
17903 * An item in a genlist can have 0 or more text labels (they can be regular 17903 * An item in a genlist can have 0 or more text labels (they can be regular
17904 * text or textblock Evas objects - that's up to the style to determine), 0 17904 * text or textblock Evas objects - that's up to the style to determine), 0
17905 * or more icons (which are simply objects swallowed into the genlist item's 17905 * or more contents (which are simply objects swallowed into the genlist item's
17906 * theming Edje object) and 0 or more <b>boolean states</b>, which have the 17906 * theming Edje object) and 0 or more <b>boolean states</b>, which have the
17907 * behavior left to the user to define. The Edje part names for each of 17907 * behavior left to the user to define. The Edje part names for each of
17908 * these properties will be looked up, in the theme file for the genlist, 17908 * these properties will be looked up, in the theme file for the genlist,
17909 * under the Edje (string) data items named @c "labels", @c "icons" and @c 17909 * under the Edje (string) data items named @c "labels", @c "contents" and @c
17910 * "states", respectively. For each of those properties, if more than one 17910 * "states", respectively. For each of those properties, if more than one
17911 * part is provided, they must have names listed separated by spaces in the 17911 * part is provided, they must have names listed separated by spaces in the
17912 * data fields. For the default genlist item theme, we have @b one label 17912 * data fields. For the default genlist item theme, we have @b one label
17913 * part (@c "elm.text"), @b two icon parts (@c "elm.swalllow.icon" and @c 17913 * part (@c "elm.text"), @b two content parts (@c "elm.swalllow.icon" and @c
17914 * "elm.swallow.end") and @b no state parts. 17914 * "elm.swallow.end") and @b no state parts.
17915 * 17915 *
17916 * A genlist item may be at one of several styles. Elementary provides one 17916 * A genlist item may be at one of several styles. Elementary provides one
@@ -17976,7 +17976,7 @@ extern "C" {
17976 * elm_genlist_item_data_get() returns the data pointer set by the item 17976 * elm_genlist_item_data_get() returns the data pointer set by the item
17977 * creation functions. 17977 * creation functions.
17978 * 17978 *
17979 * If an item changes (state of boolean changes, label or icons change), 17979 * If an item changes (state of boolean changes, label or contents change),
17980 * then use elm_genlist_item_update() to have genlist update the item with 17980 * then use elm_genlist_item_update() to have genlist update the item with
17981 * the new state. Genlist will re-realize the item thus call the functions 17981 * the new state. Genlist will re-realize the item thus call the functions
17982 * in the _Elm_Genlist_Item_Class for that item. 17982 * in the _Elm_Genlist_Item_Class for that item.
@@ -18079,7 +18079,7 @@ extern "C" {
18079 * caller to not use the object pointer from elm_genlist_item_object_get() 18079 * caller to not use the object pointer from elm_genlist_item_object_get()
18080 * in a way where it may point to freed objects. 18080 * in a way where it may point to freed objects.
18081 * - @c "unrealized" - This is called just before an item is unrealized. 18081 * - @c "unrealized" - This is called just before an item is unrealized.
18082 * After this call icon objects provided will be deleted and the item 18082 * After this call content objects provided will be deleted and the item
18083 * object itself delete or be put into a floating cache. 18083 * object itself delete or be put into a floating cache.
18084 * - @c "drag,start,up" - This is called when the item in the list has been 18084 * - @c "drag,start,up" - This is called when the item in the list has been
18085 * dragged (not scrolled) up. 18085 * dragged (not scrolled) up.
@@ -18163,7 +18163,7 @@ extern "C" {
18163 #define Elm_Genlist_Item Elm_Gen_Item /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */ 18163 #define Elm_Genlist_Item Elm_Gen_Item /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */
18164 typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func; /**< Class functions for genlist item class */ 18164 typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func; /**< Class functions for genlist item class */
18165 typedef char *(*Elm_Genlist_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for genlist item classes. */ 18165 typedef char *(*Elm_Genlist_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for genlist item classes. */
18166 typedef Evas_Object *(*Elm_Genlist_Item_Icon_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Icon fetching class function for genlist item classes. */ 18166 typedef Evas_Object *(*Elm_Genlist_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Content (swallowed object) fetching class function for genlist item classes. */
18167 typedef Eina_Bool (*Elm_Genlist_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for genlist item classes. */ 18167 typedef Eina_Bool (*Elm_Genlist_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for genlist item classes. */
18168 typedef void (*Elm_Genlist_Item_Del_Cb) (void *data, Evas_Object *obj); /**< Deletion class function for genlist item classes. */ 18168 typedef void (*Elm_Genlist_Item_Del_Cb) (void *data, Evas_Object *obj); /**< Deletion class function for genlist item classes. */
18169 18169
@@ -18183,7 +18183,7 @@ extern "C" {
18183 struct Elm_Genlist_Item_Class_Func 18183 struct Elm_Genlist_Item_Class_Func
18184 { 18184 {
18185 Elm_Genlist_Item_Label_Get_Cb label_get; /**< Label fetching class function for genlist item classes.*/ 18185 Elm_Genlist_Item_Label_Get_Cb label_get; /**< Label fetching class function for genlist item classes.*/
18186 Elm_Genlist_Item_Icon_Get_Cb icon_get; /**< Icon fetching class function for genlist item classes. */ 18186 Elm_Genlist_Item_Content_Get_Cb content_get; /**< Content fetching class function for genlist item classes. */
18187 Elm_Genlist_Item_State_Get_Cb state_get; /**< State fetching class function for genlist item classes. */ 18187 Elm_Genlist_Item_State_Get_Cb state_get; /**< State fetching class function for genlist item classes. */
18188 Elm_Genlist_Item_Del_Cb del; /**< Deletion class function for genlist item classes. */ 18188 Elm_Genlist_Item_Del_Cb del; /**< Deletion class function for genlist item classes. */
18189 } func; 18189 } func;
@@ -19150,7 +19150,8 @@ extern "C" {
19150 * 19150 *
19151 * @ingroup Genlist 19151 * @ingroup Genlist
19152 */ 19152 */
19153 EAPI void elm_genlist_item_icons_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1); 19153 EAPI void elm_genlist_item_contents_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
19154 EINA_DEPRECATED EAPI void elm_genlist_item_icons_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
19154 /** 19155 /**
19155 * Get the real Evas object created to implement the view of a 19156 * Get the real Evas object created to implement the view of a
19156 * given genlist item 19157 * given genlist item
diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c
index 4551748edc..c0d17e57d2 100644
--- a/legacy/elementary/src/lib/elc_fileselector.c
+++ b/legacy/elementary/src/lib/elc_fileselector.c
@@ -863,9 +863,9 @@ elm_fileselector_add(Evas_Object *parent)
863 elm_widget_sub_object_add(obj, bt); 863 elm_widget_sub_object_add(obj, bt);
864 wd->home_button = bt; 864 wd->home_button = bt;
865 865
866 list_itc[ELM_DIRECTORY].func.icon_get = grid_itc[ELM_DIRECTORY].func.icon_get = _itc_icon_folder_get; 866 list_itc[ELM_DIRECTORY].func.content_get = grid_itc[ELM_DIRECTORY].func.content_get = _itc_icon_folder_get;
867 list_itc[ELM_FILE_IMAGE].func.icon_get = grid_itc[ELM_FILE_IMAGE].func.icon_get = _itc_icon_image_get; 867 list_itc[ELM_FILE_IMAGE].func.content_get = grid_itc[ELM_FILE_IMAGE].func.content_get = _itc_icon_image_get;
868 list_itc[ELM_FILE_UNKNOW].func.icon_get = grid_itc[ELM_FILE_UNKNOW].func.icon_get = _itc_icon_file_get; 868 list_itc[ELM_FILE_UNKNOW].func.content_get = grid_itc[ELM_FILE_UNKNOW].func.content_get = _itc_icon_file_get;
869 869
870 for (i = 0; i < ELM_FILE_LAST; ++i) 870 for (i = 0; i < ELM_FILE_LAST; ++i)
871 { 871 {
diff --git a/legacy/elementary/src/lib/elm_gen.c b/legacy/elementary/src/lib/elm_gen.c
index 0d66974ddb..a8d24f8139 100644
--- a/legacy/elementary/src/lib/elm_gen.c
+++ b/legacy/elementary/src/lib/elm_gen.c
@@ -353,7 +353,7 @@ void
353elm_gen_item_unrealize(Elm_Gen_Item *it, 353elm_gen_item_unrealize(Elm_Gen_Item *it,
354 Eina_Bool calc) 354 Eina_Bool calc)
355{ 355{
356 Evas_Object *icon; 356 Evas_Object *content;
357 357
358 if (!it->realized) return; 358 if (!it->realized) return;
359 if (it->wd->reorder_it == it) return; 359 if (it->wd->reorder_it == it) return;
@@ -368,13 +368,13 @@ elm_gen_item_unrealize(Elm_Gen_Item *it,
368 368
369 elm_widget_stringlist_free(it->labels); 369 elm_widget_stringlist_free(it->labels);
370 it->labels = NULL; 370 it->labels = NULL;
371 elm_widget_stringlist_free(it->icons); 371 elm_widget_stringlist_free(it->contents);
372 it->icons = NULL; 372 it->contents = NULL;
373 elm_widget_stringlist_free(it->states); 373 elm_widget_stringlist_free(it->states);
374 it->states = NULL; 374 it->states = NULL;
375 375
376 EINA_LIST_FREE(it->icon_objs, icon) 376 EINA_LIST_FREE(it->content_objs, content)
377 evas_object_del(icon); 377 evas_object_del(content);
378 378
379 it->unrealize_cb(it); 379 it->unrealize_cb(it);
380 380
diff --git a/legacy/elementary/src/lib/elm_gen.h b/legacy/elementary/src/lib/elm_gen.h
index 18ba6d4b56..e36af59eb9 100644
--- a/legacy/elementary/src/lib/elm_gen.h
+++ b/legacy/elementary/src/lib/elm_gen.h
@@ -36,7 +36,7 @@ struct Elm_Gen_Item
36 Evas_Coord x, y, dx, dy; 36 Evas_Coord x, y, dx, dy;
37 Evas_Object *spacer; 37 Evas_Object *spacer;
38 Elm_Gen_Item *parent; 38 Elm_Gen_Item *parent;
39 Eina_List *labels, *icons, *states, *icon_objs; 39 Eina_List *labels, *contents, *states, *content_objs;
40 Ecore_Timer *long_timer; 40 Ecore_Timer *long_timer;
41 int relcount; 41 int relcount;
42 int walking; 42 int walking;
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 55ab4fe5a5..007bee1aa6 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -957,21 +957,23 @@ _item_realize(Elm_Gen_Item *it)
957 } 957 }
958 } 958 }
959 959
960 if (it->itc->func.icon_get) 960 if (it->itc->func.content_get)
961 { 961 {
962 const Eina_List *l; 962 const Eina_List *l;
963 const char *key; 963 const char *key;
964 Evas_Object *ic = NULL;
964 965
965 it->icons = 966 it->contents =
966 elm_widget_stringlist_get(edje_object_data_get(VIEW(it), 967 elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
967 "icons")); 968 "icons"));
968 EINA_LIST_FOREACH(it->icons, l, key) 969 EINA_LIST_FOREACH(it->contents, l, key)
969 { 970 {
970 Evas_Object *ic = it->itc->func.icon_get 971 if (it->itc->func.content_get)
971 ((void *)it->base.data, WIDGET(it), l->data); 972 ic = it->itc->func.content_get
973 ((void *)it->base.data, WIDGET(it), key);
972 if (ic) 974 if (ic)
973 { 975 {
974 it->icon_objs = eina_list_append(it->icon_objs, ic); 976 it->content_objs = eina_list_append(it->content_objs, ic);
975 edje_object_part_swallow(VIEW(it), key, ic); 977 edje_object_part_swallow(VIEW(it), key, ic);
976 evas_object_show(ic); 978 evas_object_show(ic);
977 elm_widget_sub_object_add(WIDGET(it), ic); 979 elm_widget_sub_object_add(WIDGET(it), ic);
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index f3c6b220ef..2d9959fa51 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -34,7 +34,7 @@ struct Elm_Gen_Item_Type
34 Evas_Coord w, h, minw, minh; 34 Evas_Coord w, h, minw, minh;
35 Elm_Gen_Item *group_item; 35 Elm_Gen_Item *group_item;
36 Elm_Genlist_Item_Flags flags; 36 Elm_Genlist_Item_Flags flags;
37 Eina_List *mode_labels, *mode_icons, *mode_states, *mode_icon_objs; 37 Eina_List *mode_labels, *mode_contents, *mode_states, *mode_content_objs;
38 Ecore_Timer *swipe_timer; 38 Ecore_Timer *swipe_timer;
39 Evas_Coord scrl_x, scrl_y, old_scrl_y; 39 Evas_Coord scrl_x, scrl_y, old_scrl_y;
40 40
@@ -1690,23 +1690,24 @@ _item_label_realize(Elm_Gen_Item *it,
1690} 1690}
1691 1691
1692static Eina_List * 1692static Eina_List *
1693_item_icon_realize(Elm_Gen_Item *it, 1693_item_content_realize(Elm_Gen_Item *it,
1694 Evas_Object *target, 1694 Evas_Object *target,
1695 Eina_List **source) 1695 Eina_List **source)
1696{ 1696{
1697 Eina_List *res = NULL; 1697 Eina_List *res = NULL;
1698 1698
1699 if (it->itc->func.icon_get) 1699 if (it->itc->func.content_get)
1700 { 1700 {
1701 const Eina_List *l; 1701 const Eina_List *l;
1702 const char *key; 1702 const char *key;
1703 Evas_Object *ic = NULL;
1703 1704
1704 *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons")); 1705 *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
1705 EINA_LIST_FOREACH(*source, l, key) 1706 EINA_LIST_FOREACH(*source, l, key)
1706 { 1707 {
1707 Evas_Object *ic = it->itc->func.icon_get 1708 if (it->itc->func.content_get)
1708 ((void *)it->base.data, WIDGET(it), key); 1709 ic = it->itc->func.content_get
1709 1710 ((void *)it->base.data, WIDGET(it), key);
1710 if (ic) 1711 if (ic)
1711 { 1712 {
1712 res = eina_list_append(res, ic); 1713 res = eina_list_append(res, ic);
@@ -1892,10 +1893,10 @@ _item_realize(Elm_Gen_Item *it,
1892 { 1893 {
1893 /* FIXME: If you see that assert, please notify us and we 1894 /* FIXME: If you see that assert, please notify us and we
1894 will clean our mess */ 1895 will clean our mess */
1895 assert(eina_list_count(it->icon_objs) == 0); 1896 assert(eina_list_count(it->content_objs) == 0);
1896 1897
1897 _item_label_realize(it, VIEW(it), &it->labels); 1898 _item_label_realize(it, VIEW(it), &it->labels);
1898 it->icon_objs = _item_icon_realize(it, VIEW(it), &it->icons); 1899 it->content_objs = _item_content_realize(it, VIEW(it), &it->contents);
1899 _item_state_realize(it, VIEW(it), &it->states); 1900 _item_state_realize(it, VIEW(it), &it->states);
1900 1901
1901 if (!it->item->mincalcd) 1902 if (!it->item->mincalcd)
@@ -2864,15 +2865,15 @@ _mode_item_realize(Elm_Gen_Item *it)
2864 evas_object_event_callback_add(it->item->mode_view, EVAS_CALLBACK_MOUSE_MOVE, 2865 evas_object_event_callback_add(it->item->mode_view, EVAS_CALLBACK_MOUSE_MOVE,
2865 _mouse_move, it); 2866 _mouse_move, it);
2866 2867
2867 /* label_get, icon_get, state_get */ 2868 /* label_get, content_get, state_get */
2868 /* FIXME: If you see that assert, please notify us and we 2869 /* FIXME: If you see that assert, please notify us and we
2869 will clean our mess */ 2870 will clean our mess */
2870 assert(eina_list_count(it->item->mode_icon_objs) == 0); 2871 assert(eina_list_count(it->item->mode_content_objs) == 0);
2871 2872
2872 _item_label_realize(it, it->item->mode_view, &it->item->mode_labels); 2873 _item_label_realize(it, it->item->mode_view, &it->item->mode_labels);
2873 it->item->mode_icon_objs = _item_icon_realize(it, 2874 it->item->mode_content_objs = _item_content_realize(it,
2874 it->item->mode_view, 2875 it->item->mode_view,
2875 &it->item->mode_icons); 2876 &it->item->mode_contents);
2876 _item_state_realize(it, it->item->mode_view, &it->item->mode_states); 2877 _item_state_realize(it, it->item->mode_view, &it->item->mode_states);
2877 2878
2878 edje_object_part_swallow(it->item->mode_view, 2879 edje_object_part_swallow(it->item->mode_view,
@@ -2888,18 +2889,18 @@ static void
2888_mode_item_unrealize(Elm_Gen_Item *it) 2889_mode_item_unrealize(Elm_Gen_Item *it)
2889{ 2890{
2890 Widget_Data *wd = it->wd; 2891 Widget_Data *wd = it->wd;
2891 Evas_Object *icon; 2892 Evas_Object *content;
2892 if (!it->item->mode_view) return; 2893 if (!it->item->mode_view) return;
2893 2894
2894 evas_event_freeze(evas_object_evas_get(it->wd->obj)); 2895 evas_event_freeze(evas_object_evas_get(it->wd->obj));
2895 elm_widget_stringlist_free(it->item->mode_labels); 2896 elm_widget_stringlist_free(it->item->mode_labels);
2896 it->item->mode_labels = NULL; 2897 it->item->mode_labels = NULL;
2897 elm_widget_stringlist_free(it->item->mode_icons); 2898 elm_widget_stringlist_free(it->item->mode_contents);
2898 it->item->mode_icons = NULL; 2899 it->item->mode_contents = NULL;
2899 elm_widget_stringlist_free(it->item->mode_states); 2900 elm_widget_stringlist_free(it->item->mode_states);
2900 2901
2901 EINA_LIST_FREE(it->item->mode_icon_objs, icon) 2902 EINA_LIST_FREE(it->item->mode_content_objs, content)
2902 evas_object_del(icon); 2903 evas_object_del(content);
2903 2904
2904 edje_object_part_unswallow(it->item->mode_view, VIEW(it)); 2905 edje_object_part_unswallow(it->item->mode_view, VIEW(it));
2905 evas_object_smart_member_add(VIEW(it), wd->pan_smart); 2906 evas_object_smart_member_add(VIEW(it), wd->pan_smart);
@@ -3909,7 +3910,7 @@ elm_genlist_item_disabled_set(Elm_Gen_Item *it,
3909 edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); 3910 edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
3910 else 3911 else
3911 edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm"); 3912 edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
3912 EINA_LIST_FOREACH(it->icon_objs, l, obj) 3913 EINA_LIST_FOREACH(it->content_objs, l, obj)
3913 elm_widget_disabled_set(obj, disabled); 3914 elm_widget_disabled_set(obj, disabled);
3914 } 3915 }
3915} 3916}
@@ -4144,13 +4145,19 @@ elm_genlist_item_data_get(const Elm_Gen_Item *it)
4144EAPI void 4145EAPI void
4145elm_genlist_item_icons_orphan(Elm_Gen_Item *it) 4146elm_genlist_item_icons_orphan(Elm_Gen_Item *it)
4146{ 4147{
4147 Evas_Object *icon; 4148 elm_genlist_item_contents_orphan(it);
4149}
4150
4151EAPI void
4152elm_genlist_item_contents_orphan(Elm_Gen_Item *it)
4153{
4154 Evas_Object *content;
4148 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it); 4155 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
4149 EINA_LIST_FREE(it->icon_objs, icon) 4156 EINA_LIST_FREE(it->content_objs, content)
4150 { 4157 {
4151 elm_widget_sub_object_del(WIDGET(it), icon); 4158 elm_widget_sub_object_del(WIDGET(it), content);
4152 evas_object_smart_member_del(icon); 4159 evas_object_smart_member_del(content);
4153 evas_object_hide(icon); 4160 evas_object_hide(content);
4154 } 4161 }
4155} 4162}
4156 4163
diff --git a/legacy/elementary/src/lib/elm_store.c b/legacy/elementary/src/lib/elm_store.c
index a9adff3c16..ce1cfcf94f 100644
--- a/legacy/elementary/src/lib/elm_store.c
+++ b/legacy/elementary/src/lib/elm_store.c
@@ -313,7 +313,7 @@ _store_item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
313} 313}
314 314
315static Evas_Object * 315static Evas_Object *
316_store_item_icon_get(void *data, Evas_Object *obj, const char *part) 316_store_item_content_get(void *data, Evas_Object *obj, const char *part)
317{ 317{
318 Elm_Store_Item *sti = data; 318 Elm_Store_Item *sti = data;
319 LKL(sti->lock); 319 LKL(sti->lock);
@@ -476,7 +476,7 @@ _store_filesystem_list_update(void *data, Ecore_Thread *th __UNUSED__, void *msg
476 else 476 else
477 { 477 {
478 itc->func.label_get = _store_item_label_get; 478 itc->func.label_get = _store_item_label_get;
479 itc->func.icon_get = _store_item_icon_get; 479 itc->func.content_get = _store_item_content_get;
480 itc->func.state_get = NULL; // FIXME: support state gets later 480 itc->func.state_get = NULL; // FIXME: support state gets later
481 itc->func.del = _store_item_del; 481 itc->func.del = _store_item_del;
482 } 482 }
@@ -508,7 +508,7 @@ _elm_store_new(size_t size)
508 // setup default item class (always the same) if list cb doesnt provide one 508 // setup default item class (always the same) if list cb doesnt provide one
509 _store_item_class.item_style = "default"; 509 _store_item_class.item_style = "default";
510 _store_item_class.func.label_get = _store_item_label_get; 510 _store_item_class.func.label_get = _store_item_label_get;
511 _store_item_class.func.icon_get = _store_item_icon_get; 511 _store_item_class.func.content_get = _store_item_content_get;
512 _store_item_class.func.state_get = NULL; // FIXME: support state gets later 512 _store_item_class.func.state_get = NULL; // FIXME: support state gets later
513 _store_item_class.func.del = _store_item_del; 513 _store_item_class.func.del = _store_item_del;
514 // TODO: END - move to elm_store_init() 514 // TODO: END - move to elm_store_init()