elm_icon does grok this
authorenglebass <englebass@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Sat, 5 Feb 2011 20:14:24 +0000 (20:14 +0000)
committerenglebass <englebass@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Sat, 5 Feb 2011 20:14:24 +0000 (20:14 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@56736 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/bin/test_icon_desktops.c

index afc300a..f9b8a94 100644 (file)
@@ -19,7 +19,6 @@ desk_gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UN
 static Evas_Object *
 desk_gl_icon_get(void *data, Evas_Object *obj, const char *part)
 {
-   // FIXME: elm_icon should grok this
 #ifdef ELM_EFREET   
    Efreet_Desktop *d = (Efreet_Desktop *)data;
    const char *path;
@@ -28,28 +27,7 @@ desk_gl_icon_get(void *data, Evas_Object *obj, const char *part)
    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);
-        return ic;
-     }
+   elm_icon_standard_set(ic, d->icon);
    return ic;
 #else
    return NULL;