patch from zub in #e to fix example building

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64399 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/examples/gengrid_example.c b/src/examples/gengrid_example.c
index 1b2e720..aca7182 100644 (file)
--- a/src/examples/gengrid_example.c
+++ b/src/examples/gengrid_example.c
@@ -606,7 +606,7 @@ elm_main(int    argc __UNUSED__,
 
    gic.item_style = "default";
    gic.func.label_get = _grid_label_get;
-   gic.func.content_get = _grid_icon_get;
+   gic.func.content_get = _grid_content_get;
    gic.func.state_get = _grid_state_get;
    gic.func.del = _grid_del;
 

diff --git a/src/examples/genlist_example_01.c b/src/examples/genlist_example_01.c
index cc7042f..f60ef41 100644 (file)
--- a/src/examples/genlist_example_01.c
+++ b/src/examples/genlist_example_01.c
@@ -59,7 +59,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "default";
    _itc.func.label_get = _item_label_get;
-   _itc.func.content_get = _item_icon_get;
+   _itc.func.content_get = _item_content_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 

diff --git a/src/examples/genlist_example_02.c b/src/examples/genlist_example_02.c
index 613c84b..8d28977 100644 (file)
--- a/src/examples/genlist_example_02.c
+++ b/src/examples/genlist_example_02.c
@@ -116,7 +116,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "default";
    _itc.func.label_get = _item_label_get;
-   _itc.func.content_get = _item_icon_get;
+   _itc.func.content_get = _item_content_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 

diff --git a/src/examples/genlist_example_03.c b/src/examples/genlist_example_03.c
index 712f778..efc533e 100644 (file)
--- a/src/examples/genlist_example_03.c
+++ b/src/examples/genlist_example_03.c
@@ -104,7 +104,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "double_label";
    _itc.func.label_get = _item_label_get;
-   _itc.func.content_get = _item_icon_get;
+   _itc.func.content_get = _item_content_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 

diff --git a/src/examples/genlist_example_04.c b/src/examples/genlist_example_04.c
index bb309e1..3c53b1a 100644 (file)
--- a/src/examples/genlist_example_04.c
+++ b/src/examples/genlist_example_04.c
@@ -289,13 +289,13 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "double_label";
    _itc.func.label_get = _item_label_get;
-   _itc.func.content_get = _item_icon_get;
+   _itc.func.content_get = _item_content_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
    _itc_group.item_style = "group_index";
    _itc_group.func.label_get = _group_label_get;
-   _itc_group.func.content_get = _group_icon_get;
+   _itc_group.func.content_get = _group_content_get;
    _itc_group.func.state_get = NULL;
    _itc_group.func.del = NULL;
 

diff --git a/src/examples/genlist_example_05.c b/src/examples/genlist_example_05.c
index 5c4b389..7e0151b 100644 (file)
--- a/src/examples/genlist_example_05.c
+++ b/src/examples/genlist_example_05.c
@@ -337,19 +337,19 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "default";
    _itc.func.label_get = _item_label_get;
-   _itc.func.content_get = _item_icon_get;
+   _itc.func.content_get = _item_content_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
    _itp.item_style = "default";
    _itp.func.label_get = _parent_label_get;
-   _itp.func.content_get = _parent_icon_get;
+   _itp.func.content_get = _parent_content_get;
    _itp.func.state_get = NULL;
    _itp.func.del = NULL;
 
    _itfav.item_style = "default";
    _itfav.func.label_get = _favorite_label_get;
-   _itfav.func.content_get = _favorite_icon_get;
+   _itfav.func.content_get = _favorite_content_get;
    _itfav.func.state_get = NULL;
    _itfav.func.del = NULL;
 

diff --git a/src/examples/index_example_02.c b/src/examples/index_example_02.c
index 6f41e51..11e20b4 100644 (file)
--- a/src/examples/index_example_02.c
+++ b/src/examples/index_example_02.c
@@ -116,7 +116,7 @@ elm_main(int    argc __UNUSED__,
 
    gic.item_style = "default";
    gic.func.label_get = _grid_label_get;
-   gic.func.content_get = _grid_icon_get;
+   gic.func.content_get = _grid_content_get;
    gic.func.state_get = NULL;
    gic.func.del = NULL;
 

diff --git a/src/examples/thumb_example_01.c b/src/examples/thumb_example_01.c
index b038109..5891672 100644 (file)
--- a/src/examples/thumb_example_01.c
+++ b/src/examples/thumb_example_01.c
@@ -30,6 +30,7 @@ _generation_error_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *eve
 int
 elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 {
+#if 0
    Evas_Object *win, *bg;
    Evas_Object *thumb;
    Ethumb_Client *client;
@@ -78,7 +79,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
    elm_run(); /* and run the program now, starting to handle all
                * events, etc. */
    elm_shutdown(); /* clean up and shut down */
-
+#endif
    /* exit code */
    return 0;
 }