Signed-off-by: Martin Jansa <[email protected]>
---
 E-MODULES-EXTRA/elfe/src/allapps.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/E-MODULES-EXTRA/elfe/src/allapps.c 
b/E-MODULES-EXTRA/elfe/src/allapps.c
index a1ae04a..1feaad8 100644
--- a/E-MODULES-EXTRA/elfe/src/allapps.c
+++ b/E-MODULES-EXTRA/elfe/src/allapps.c
@@ -45,7 +45,7 @@ _label_get(void *data, Evas_Object *obj __UNUSED__, const 
char *part __UNUSED__)
 }
 
 static Evas_Object *
-_icon_get(void *data, Evas_Object *obj, const char *part)
+_content_get(void *data, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = NULL;
    Elfe_Grid_Item *gitem = data;
@@ -84,7 +84,7 @@ _gl_longpress(void *data, Evas_Object *obj __UNUSED__, void 
*event_info)
 
    evas_object_smart_callback_call(allapps->box,
                                   "entry,longpressed", gitem->menu);
-   elm_gengrid_item_selected_set(it, EINA_FALSE);
+   elm_gen_item_selected_set(it, EINA_FALSE);
 }
 
 static void
@@ -97,7 +97,7 @@ _widget_longpress(void *data, Evas_Object *obj __UNUSED__, 
void *event_info)
    printf("Send widget longpressed\n");
    evas_object_smart_callback_call(allapps->box,
                                   "gadget,longpressed", (void*)name);
-   elm_genlist_item_selected_set(it, EINA_FALSE);
+   elm_gen_item_selected_set(it, EINA_FALSE);
 }
 
 static void
@@ -107,7 +107,7 @@ _item_selected(void *data, Evas_Object *obj __UNUSED__, 
void *event_info)
    Elm_Gengrid_Item *it = event_info;
 
    evas_object_smart_callback_call(gitem->allapps->box, "item,selected", 
gitem->menu);
-   elm_gengrid_item_selected_set(it, EINA_FALSE);
+   elm_gen_item_selected_set(it, EINA_FALSE);
 }
 
 
@@ -267,7 +267,7 @@ elfe_allapps_add(Evas_Object *parent)
    ic = elm_icon_add(bt);
    elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/applications");
    evas_object_show(ic);
-   elm_button_icon_set(bt, ic);
+   elm_button_content_set(bt, ic);
    evas_object_show(bt);
    elm_box_pack_end(allapps->selector, bt);
    evas_object_smart_callback_add(bt, "clicked", _apps_clicked_cb, allapps);
@@ -282,7 +282,7 @@ elfe_allapps_add(Evas_Object *parent)
    ic = elm_icon_add(bt);
    elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/widgets");
    evas_object_show(ic);
-   elm_button_icon_set(bt, ic);
+   elm_button_content_set(bt, ic);
    evas_object_show(bt);
    elm_box_pack_end(allapps->selector, bt);
    evas_object_smart_callback_add(bt, "clicked", _widgets_clicked_cb, allapps);
@@ -297,7 +297,7 @@ elfe_allapps_add(Evas_Object *parent)
    ic = elm_icon_add(bt);
    elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/configuration");
    evas_object_show(ic);
-   elm_button_icon_set(bt, ic);
+   elm_button_content_set(bt, ic);
    evas_object_show(bt);
    elm_box_pack_end(allapps->selector, bt);
    evas_object_smart_callback_add(bt, "clicked", _config_clicked_cb, allapps);
@@ -320,7 +320,7 @@ elfe_allapps_add(Evas_Object *parent)
                                  _obj_del_cb, allapps);
 
    elm_gengrid_multi_select_set(allapps->grid, EINA_FALSE);
-   elm_gengrid_bounce_set(allapps->grid, EINA_FALSE, EINA_TRUE);
+   elm_gen_bounce_set(allapps->grid, EINA_FALSE, EINA_TRUE);
 
    evas_object_size_hint_weight_set(allapps->grid, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(allapps->grid, EVAS_HINT_FILL, 
EVAS_HINT_FILL);
@@ -331,7 +331,7 @@ elfe_allapps_add(Evas_Object *parent)
 
    app_itc.item_style     = "default";
    app_itc.func.label_get = _label_get;
-   app_itc.func.icon_get  = _icon_get;
+   app_itc.func.content_get  = _content_get;
    app_itc.func.state_get = NULL;
    app_itc.func.del       = NULL;
 
-- 
1.7.7.1


------------------------------------------------------------------------------
Get your Android app more play: Bring it to the BlackBerry PlayBook 
in minutes. BlackBerry App World&#153; now supports Android&#153; Apps 
for the BlackBerry&reg; PlayBook&#153;. Discover just how easy and simple 
it is! http://p.sf.net/sfu/android-dev2dev
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to