From 003a843d2aa39daa31e4d8916564548572aa7379 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 4 Mar 2009 03:02:01 +0000 Subject: [PATCH] fileman bookmarks now respect icon theme overrides setting. SVN revision: 39356 --- data/themes/default.edc | 1 + src/modules/fileman/e_mod_main.c | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 42e7c0061..5770b729f 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -22664,6 +22664,7 @@ ICON("user-home","icon_efm_home.png",64) ICON("user-desktop","icon_efm_desktop.png",64) ICON("user-bookmarks","icon_favorites.png",64) ICON("computer","icon_efm_root.png", 64) +ICON("folder","icon_efm_folder.png",64) ICONMIME("inode/chardevice","icon_efm_file.png",128) diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index cbdf33b37..7fc9ff580 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -266,14 +266,12 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator) E_Menu_Item *mi; Efreet_Uri *uri; char *alias; - char *icon; FILE* fp; snprintf(buf, sizeof(buf), "%s/.gtk-bookmarks", e_user_homedir_get()); fp = fopen(buf, "r"); if (fp) { - icon = efreet_icon_path_find(e_config->icon_theme, "folder", 16); while(fgets(line, sizeof(line), fp)) { alias = NULL; @@ -299,14 +297,13 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator) mi = e_menu_item_new(m); e_menu_item_label_set(mi, alias ? alias : ecore_file_file_get(uri->path)); - e_menu_item_icon_file_set(mi, icon); + e_util_menu_item_fdo_icon_set(mi, "folder"); e_menu_item_callback_set(mi, _e_mod_menu_gtk_cb, strdup(uri->path)); } } if (uri) efreet_uri_free(uri); } - if (icon) free(icon); fclose(fp); } }