Elementary migration revision 69448

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

diff --git a/src/bin/test_icon_desktops.c b/src/bin/test_icon_desktops.c
index 96e14f1..19fd36a 100644 (file)
--- a/src/bin/test_icon_desktops.c
+++ b/src/bin/test_icon_desktops.c
@@ -1,81 +1,72 @@
 #include <Elementary.h>
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
 #ifndef ELM_LIB_QUICKLAUNCH
 static Elm_Genlist_Item_Class it_desk;
 
 static char *
-desk_gl_label_get(const void *data, Evas_Object *obj, const char *part)
+desk_gl_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
-#ifdef ELM_EFREET   
+#ifdef ELM_EFREET
    Efreet_Desktop *d = (Efreet_Desktop *)data;
    return strdup(d->name);
 #else
    return NULL;
-#endif   
+   (void)data;
+#endif
 }
 static Evas_Object *
-desk_gl_icon_get(const void *data, Evas_Object *obj, const char *part)
+desk_gl_content_get(void *data, Evas_Object *obj, const char *part)
 {
-   // FIXME: elm_icon should grok this
-#ifdef ELM_EFREET   
+#ifdef ELM_EFREET
    Efreet_Desktop *d = (Efreet_Desktop *)data;
-   char *path;
    Evas_Object *ic;
+
    ic = elm_icon_add(obj);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    if (!(!strcmp(part, "elm.swallow.icon"))) return ic;
    if (!d->icon) return ic;
-   path = efreet_icon_path_find(getenv("E_ICON_THEME"), d->icon, 48);
-   if (!path) 
-     {
-        path = efreet_icon_path_find("default", d->icon, 48);
-        if (!path)
-          {
-             path = efreet_icon_path_find("hicolor", d->icon, 48);
-             if (!path)
-               {
-                  path = efreet_icon_path_find("gnome", d->icon, 48);
-                  if (!path)
-                    {
-                       path = efreet_icon_path_find("Human", d->icon, 48);
-                    }
-               }
-          }
-     }
-   if (path)
-     {
-        elm_icon_file_set(ic, path, NULL);
-        free(path);
-        return ic;
-     }
+   elm_icon_standard_set(ic, d->icon);
    return ic;
 #else
    return NULL;
-#endif   
+   (void)data;
+   (void)obj;
+   (void)part;
+#endif
 }
 static void
-desk_gl_del(const void *data, Evas_Object *obj)
+desk_gl_del(void *data, Evas_Object *obj __UNUSED__)
 {
-#ifdef ELM_EFREET   
+#ifdef ELM_EFREET
    Efreet_Desktop *d = (Efreet_Desktop *)data;
    efreet_desktop_free(d);
-#endif   
+#else
+   return;
+   (void)data;
+#endif
 }
 
+#ifdef ELM_EFREET
 static void
-desktop_sel(void *data, Evas_Object *obj, void *event_info)
+desktop_sel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("sel\n");
 }
+#endif
 
 void
-test_icon_desktops(void *data, Evas_Object *obj, void *event_info)
+test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win, *bg, *gl;
+#ifdef ELM_EFREET
    Eina_List *desktops;
+#endif
 
-   win = elm_win_add(NULL, "icon_desktops", ELM_WIN_BASIC);
+   win = elm_win_add(NULL, "icon-desktops", ELM_WIN_BASIC);
    elm_win_title_set(win, "Icon Desktops");
-   elm_win_autodel_set(win, 1);
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bg = elm_bg_add(win);
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -83,8 +74,8 @@ test_icon_desktops(void *data, Evas_Object *obj, void *event_info)
    evas_object_show(bg);
 
    it_desk.item_style     = "default";
-   it_desk.func.label_get = desk_gl_label_get;
-   it_desk.func.icon_get  = desk_gl_icon_get;
+   it_desk.func.text_get = desk_gl_text_get;
+   it_desk.func.content_get  = desk_gl_content_get;
    it_desk.func.state_get = NULL;
    it_desk.func.del       = desk_gl_del;
 
@@ -94,16 +85,18 @@ test_icon_desktops(void *data, Evas_Object *obj, void *event_info)
    evas_object_show(gl);
 
 #ifdef ELM_EFREET
-   elm_need_efreet();
-   desktops = efreet_util_desktop_name_glob_list("*");
-   if (desktops)
+   if (elm_need_efreet())
      {
-        Efreet_Desktop *d;
+       desktops = efreet_util_desktop_name_glob_list("*");
+       if (desktops)
+         {
+           Efreet_Desktop *d;
 
-        EINA_LIST_FREE(desktops, d)
-         elm_genlist_item_append(gl, &it_desk, d,
-                                 NULL, ELM_GENLIST_ITEM_NONE,
-                                 desktop_sel, NULL);
+           EINA_LIST_FREE(desktops, d)
+             elm_genlist_item_append(gl, &it_desk, d,
+                                    NULL, ELM_GENLIST_ITEM_NONE,
+                                    desktop_sel, NULL);
+         }
      }
 #endif