forked from enlightenment/enlightenment
Remove file_set commands
Use fdo icons in e_icon directly instead SVN revision: 54178
This commit is contained in:
parent
1ba2fd77a0
commit
5c5e1b82e6
|
@ -978,26 +978,6 @@ e_util_icon_add(const char *path, Evas *evas)
|
|||
return o;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_util_icon_file_set(Evas_Object *icon, const char *path)
|
||||
{
|
||||
const char *ext;
|
||||
|
||||
if (!path) return;
|
||||
if (!ecore_file_exists(path)) return;
|
||||
|
||||
ext = strrchr(path, '.');
|
||||
if (ext)
|
||||
{
|
||||
if (!strcmp(ext, ".edj"))
|
||||
e_icon_file_edje_set(icon, path, "icon");
|
||||
else
|
||||
e_icon_file_set(icon, path);
|
||||
}
|
||||
else
|
||||
e_icon_file_set(icon, path);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas)
|
||||
{
|
||||
|
@ -1005,13 +985,6 @@ e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas)
|
|||
return e_util_icon_theme_icon_add(desktop->icon, size, evas);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_util_desktop_icon_file_set(Evas_Object *icon, Efreet_Desktop *desktop, unsigned int size)
|
||||
{
|
||||
if ((!desktop) || (!desktop->icon)) return;
|
||||
return e_util_icon_theme_icon_file_set(icon, desktop->icon, size);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
|
||||
{
|
||||
|
@ -1033,27 +1006,6 @@ e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_util_icon_theme_icon_file_set(Evas_Object *icon, const char *icon_name, unsigned int size)
|
||||
{
|
||||
if (!icon_name) return;
|
||||
if (icon_name[0] == '/')
|
||||
{
|
||||
e_util_icon_file_set(icon, icon_name);
|
||||
}
|
||||
else
|
||||
{
|
||||
char *path;
|
||||
|
||||
path = efreet_icon_path_find(e_config->icon_theme, icon_name, size);
|
||||
if (path)
|
||||
{
|
||||
e_util_icon_file_set(icon, path);
|
||||
free(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi)
|
||||
{
|
||||
|
|
|
@ -61,11 +61,8 @@ EAPI char *e_util_file_time_get(time_t ftime);
|
|||
EAPI void e_util_library_path_strip(void);
|
||||
EAPI void e_util_library_path_restore(void);
|
||||
EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas);
|
||||
EAPI void e_util_icon_file_set(Evas_Object *icon, const char *path);
|
||||
EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas);
|
||||
EAPI void e_util_desktop_icon_file_set(Evas_Object *icon, Efreet_Desktop *desktop, unsigned int size);
|
||||
EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
|
||||
EAPI void e_util_icon_theme_icon_file_set(Evas_Object *icon, const char *icon_name, unsigned int size);
|
||||
EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi);
|
||||
EAPI int e_util_dir_check(const char *dir);
|
||||
EAPI void e_util_defer_object_del(E_Object *obj);
|
||||
|
|
Loading…
Reference in New Issue