src/bin src/edje_external conflict fixed

[framework/uifw/elementary.git] / src / bin / test_eio.c

diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index 3124b05..865b912 100644 (file)
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -20,8 +20,8 @@ static void _ls_main_cb(void *data, Eio_File *handler, const char *file);
 static void _ls_done_cb(void *data, Eio_File *handler);
 static void _ls_error_cb(void *data, Eio_File *handler, int error);
 static void _file_chosen(void *data, Evas_Object *obj, void *event_info);
-static char *_gl_label_get(void *data, Evas_Object *obj, const char *part);
-static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part);
+static char *_gl_text_get(void *data, Evas_Object *obj, const char *part);
+static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *part);
 static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part);
 static void _gl_del(void *data, Evas_Object *obj);
 static void _test_eio_clear(void *data, Evas_Object *obj, void *event);
@@ -37,6 +37,15 @@ _ls_filter_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, const char *f
   return EINA_TRUE;
 }
 
+static int
+_compare_cb(const void *data1, const void *data2)
+{
+   Elm_Object_Item *it = (Elm_Object_Item *)data1;
+   Elm_Object_Item *it2 = (Elm_Object_Item *)data2;
+   return strcoll(elm_object_item_data_get(it),
+                  elm_object_item_data_get(it2));
+}
+
 static void
 _ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
 {
@@ -45,7 +54,7 @@ _ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
                                   eina_stringshare_add(file),
                                   NULL,
                                   ELM_GENLIST_ITEM_NONE,
-                                  (Eina_Compare_Cb) strcmp,
+                                  _compare_cb,
                                   _sel_file,
                                   NULL);
 }
@@ -84,7 +93,7 @@ _file_chosen(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 }
 
 static char *
-_gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+_gl_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "Item # %s", (char*)data);
@@ -92,7 +101,7 @@ _gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED
 }
 
 static Evas_Object *
-_gl_icon_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+_gl_content_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
    return NULL;
 }
@@ -120,14 +129,14 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *gl;
 
    it_eio.item_style     = "default";
-   it_eio.func.label_get = _gl_label_get;
-   it_eio.func.icon_get  = _gl_icon_get;
+   it_eio.func.text_get = _gl_text_get;
+   it_eio.func.content_get  = _gl_content_get;
    it_eio.func.state_get = _gl_state_get;
    it_eio.func.del       = _gl_del;
 
    win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC);
    elm_win_title_set(win, "File Selector Button");
-   elm_win_autodel_set(win, 1);
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bg = elm_bg_add(win);
    elm_win_resize_object_add(win, bg);
@@ -153,7 +162,7 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    fs_bt = elm_fileselector_button_add(win);
    elm_object_text_set(fs_bt, "Select a dir");
-   elm_fileselector_button_icon_set(fs_bt, ic);
+   elm_object_part_content_set(fs_bt, "icon", ic);
    elm_fileselector_button_inwin_mode_set(fs_bt, EINA_TRUE);
    elm_fileselector_button_folder_only_set(fs_bt, EINA_TRUE);