jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fileman menu: fix separator adding. 

while testing with no ~/.gtk-bookmarks and no volume, I was getting a
trailing separator. The new code should just add separators in correct
situations.



SVN revision: 39351
This commit is contained in:
Gustavo Sverzut Barbieri 2009-03-03 22:53:39 +00:00
parent 0a61c86043
commit ad65729d12
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/fileman/e_mod_main.c
View File

@ -259,7 +259,7 @@ _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi)
} }
static void static void
_e_mod_fileman_parse_gtk_bookmarks(E_Menu *m) _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator)
{ {
char line[PATH_MAX]; char line[PATH_MAX];
char buf[PATH_MAX]; char buf[PATH_MAX];
@ -289,6 +289,13 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m)
{ {
if (ecore_file_exists(uri->path)) if (ecore_file_exists(uri->path))
{ {
if (need_separator)
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
need_separator = 0;
}
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));
@ -343,15 +350,21 @@ _e_mod_menu_generate(void *data, E_Menu *m)
e_util_menu_item_fdo_icon_set(mi, "computer"); e_util_menu_item_fdo_icon_set(mi, "computer");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "/"); e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "/");
//separator Eina_Bool need_separator = 1;
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
/* Volumes */ /* Volumes */
Eina_Bool volumes_visible = 0; Eina_Bool volumes_visible = 0;
EINA_LIST_FOREACH(e_fm2_hal_volume_list_get(), l, vol) EINA_LIST_FOREACH(e_fm2_hal_volume_list_get(), l, vol)
{ {
if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue; if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;
if (need_separator)
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
need_separator = 0;
}
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, vol->label); e_menu_item_label_set(mi, vol->label);
e_util_menu_item_fdo_icon_set(mi, vol->icon); e_util_menu_item_fdo_icon_set(mi, vol->icon);
@ -362,12 +375,7 @@ _e_mod_menu_generate(void *data, E_Menu *m)
/* Favorites */ /* Favorites */
//~ if (places_conf->show_bookm) //~ if (places_conf->show_bookm)
//~ { //~ {
if (volumes_visible) _e_mod_fileman_parse_gtk_bookmarks(m, need_separator || volumes_visible > 0);
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
}
_e_mod_fileman_parse_gtk_bookmarks(m);
//~ } //~ }
e_menu_pre_activate_callback_set(m, NULL, NULL); e_menu_pre_activate_callback_set(m, NULL, NULL);