fileman bookmarks now respect icon theme overrides setting.

SVN revision: 39356
This commit is contained in:
Gustavo Sverzut Barbieri 2009-03-04 03:02:01 +00:00
parent cb629d5a56
commit 003a843d2a
2 changed files with 2 additions and 4 deletions

View File

@ -22664,6 +22664,7 @@ ICON("user-home","icon_efm_home.png",64)
ICON("user-desktop","icon_efm_desktop.png",64) ICON("user-desktop","icon_efm_desktop.png",64)
ICON("user-bookmarks","icon_favorites.png",64) ICON("user-bookmarks","icon_favorites.png",64)
ICON("computer","icon_efm_root.png", 64) ICON("computer","icon_efm_root.png", 64)
ICON("folder","icon_efm_folder.png",64)
ICONMIME("inode/chardevice","icon_efm_file.png",128) ICONMIME("inode/chardevice","icon_efm_file.png",128)

View File

@ -266,14 +266,12 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator)
E_Menu_Item *mi; E_Menu_Item *mi;
Efreet_Uri *uri; Efreet_Uri *uri;
char *alias; char *alias;
char *icon;
FILE* fp; FILE* fp;
snprintf(buf, sizeof(buf), "%s/.gtk-bookmarks", e_user_homedir_get()); snprintf(buf, sizeof(buf), "%s/.gtk-bookmarks", e_user_homedir_get());
fp = fopen(buf, "r"); fp = fopen(buf, "r");
if (fp) if (fp)
{ {
icon = efreet_icon_path_find(e_config->icon_theme, "folder", 16);
while(fgets(line, sizeof(line), fp)) while(fgets(line, sizeof(line), fp))
{ {
alias = NULL; 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); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, alias ? alias : e_menu_item_label_set(mi, alias ? alias :
ecore_file_file_get(uri->path)); 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, e_menu_item_callback_set(mi, _e_mod_menu_gtk_cb,
strdup(uri->path)); strdup(uri->path));
} }
} }
if (uri) efreet_uri_free(uri); if (uri) efreet_uri_free(uri);
} }
if (icon) free(icon);
fclose(fp); fclose(fp);
} }
} }