icon_get -> content_get

diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index e0987f7..9bc4d07 100644 (file)
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -25,7 +25,7 @@ grd_lbl_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__
 }
 
 Evas_Object *
-grd_icon_get(void *data, Evas_Object *obj, const char *part)
+grd_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *ti = data;
    if (!strcmp(part, "elm.swallow.icon"))
@@ -260,7 +260,7 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    gic.item_style = "default";
    gic.func.label_get = grd_lbl_get;
-   gic.func.icon_get = grd_icon_get;
+   gic.func.content_get = grd_content_get;
 
    n = 0;
    for (i = 0; i < 3 * 3; i++)

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 0eaefc4..1371631 100644 (file)
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -105,7 +105,7 @@ grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSE
 }
 
 Evas_Object *
-grid_icon_get(void *data, Evas_Object *obj, const char *part)
+grid_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *ti = data;
    if (!strcmp(part, "elm.swallow.icon"))
@@ -182,7 +182,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    gic.item_style = "default";
    gic.func.label_get = grid_label_get;
-   gic.func.icon_get = grid_icon_get;
+   gic.func.content_get = grid_content_get;
    gic.func.state_get = grid_state_get;
    gic.func.del = grid_del;
 
@@ -355,7 +355,7 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    gic.item_style = "default";
    gic.func.label_get = grid_label_get;
-   gic.func.icon_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/bin/test_tooltip.c b/src/bin/test_tooltip.c
index e6902b7..21d1f0a 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -26,9 +26,9 @@ grdt_lbl_get(void            *data,
 }
 
 Evas_Object *
-grdt_icon_get(void        *data,
-              Evas_Object *obj,
-              const char  *part)
+grdt_content_get(void        *data,
+                 Evas_Object *obj,
+                 const char  *part)
 {
    const Testitem *ti = data;
    if (!strcmp(part, "elm.swallow.icon"))
@@ -493,7 +493,7 @@ test_tooltip2(void *data       __UNUSED__,
 
    gic.item_style = "default";
    gic.func.label_get = grdt_lbl_get;
-   gic.func.icon_get = grdt_icon_get;
+   gic.func.content_get = grdt_content_get;
 
    n = 0;
    for (i = 0; i < 9; i++)

diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 598df2b..953293a 100644 (file)
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -856,9 +856,9 @@ elm_fileselector_add(Evas_Object *parent)
    elm_widget_sub_object_add(obj, bt);
    wd->home_button = bt;
 
-   list_itc[ELM_DIRECTORY].func.icon_get = grid_itc[ELM_DIRECTORY].func.icon_get = _itc_icon_folder_get;
-   list_itc[ELM_FILE_IMAGE].func.icon_get = grid_itc[ELM_FILE_IMAGE].func.icon_get = _itc_icon_image_get;
-   list_itc[ELM_FILE_UNKNOW].func.icon_get = grid_itc[ELM_FILE_UNKNOW].func.icon_get = _itc_icon_file_get;
+   list_itc[ELM_DIRECTORY].func.icon_get = grid_itc[ELM_DIRECTORY].func.content_get = _itc_icon_folder_get;
+   list_itc[ELM_FILE_IMAGE].func.icon_get = grid_itc[ELM_FILE_IMAGE].func.content_get = _itc_icon_image_get;
+   list_itc[ELM_FILE_UNKNOW].func.icon_get = grid_itc[ELM_FILE_UNKNOW].func.content_get = _itc_icon_file_get;
 
    for (i = 0; i < ELM_FILE_LAST; ++i)
      {

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index d69a3ce..a0ec14f 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -926,7 +926,7 @@ _item_realize(Elm_Gengrid_Item *it)
           }
      }
 
-   if (it->gic->func.icon_get)
+   if (it->gic->func.content_get)
      {
         const Eina_List *l;
         const char *key;
@@ -936,7 +936,7 @@ _item_realize(Elm_Gengrid_Item *it)
                                                           "icons"));
         EINA_LIST_FOREACH(it->icons, l, key)
           {
-             Evas_Object *ic = it->gic->func.icon_get
+             Evas_Object *ic = it->gic->func.content_get
                 ((void *)it->base.data, it->wd->self, l->data);
              if (ic)
                {