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

so apparently we were using the wrong value for the show_desktop_icons option...fixed I guess? 

SVN revision: 81749
This commit is contained in:
Mike Blumenkrantz 2012-12-27 15:05:44 +00:00
parent 63eb7c4329
commit 008f60210e
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-27 Mike Blumenkrantz
* Filemanager now uses global setting option for showing desktop
icons
2012-12-26 Chidambar Zinnoury (ilLogict)
* Notification settings: add check changed.

2
NEWS
View File

@ -29,3 +29,5 @@ Fixes:
* File manager settings values are now all read, checked and applied as they should.
* Fixed crash when changing ibar source
* Fixed SIGFPE in tiling module and functionality of toggle_rows_count
* Filemanager now uses global setting option for showing desktop
icons

2
src/modules/fileman/e_fwin.c
View File

@ -592,7 +592,7 @@ e_fwin_reload_all(void)
EINA_LIST_FOREACH(con->zones, lll, zone)
{
if (e_fwin_zone_find(zone)) continue;
if (fileman_config->view.show_desktop_icons)
if (e_config->show_desktop_icons)
e_fwin_zone_new(zone, e_mod_fileman_path_find(zone));
}
}

6
src/modules/fileman/e_mod_config.c
View File

@ -144,7 +144,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->copy = e_config->filemanager_copy;
cfdata->secure_rm = e_config->filemanager_secure_rm;
cfdata->view.show_full_path = fileman_config->view.show_full_path;
cfdata->view.show_desktop_icons = fileman_config->view.show_desktop_icons;
cfdata->view.show_desktop_icons = e_config->show_desktop_icons;
cfdata->view.show_toolbar = fileman_config->view.show_toolbar;
cfdata->view.show_sidebar = fileman_config->view.show_sidebar;
cfdata->view.desktop_navigation = fileman_config->view.desktop_navigation;
@ -186,7 +186,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
e_config->filemanager_copy = cfdata->copy;
e_config->filemanager_secure_rm = cfdata->secure_rm;
fileman_config->view.show_full_path = cfdata->view.show_full_path;
fileman_config->view.show_desktop_icons = cfdata->view.show_desktop_icons;
e_config->show_desktop_icons = cfdata->view.show_desktop_icons;
fileman_config->view.show_toolbar = cfdata->view.show_toolbar;
fileman_config->view.show_sidebar = cfdata->view.show_sidebar;
fileman_config->view.desktop_navigation = cfdata->view.desktop_navigation;
@ -234,7 +234,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__,
(e_config->filemanager_copy != cfdata->copy) ||
(e_config->filemanager_secure_rm != cfdata->secure_rm) ||
(fileman_config->view.show_full_path != cfdata->view.show_full_path) ||
(fileman_config->view.show_desktop_icons != cfdata->view.show_desktop_icons) ||
(e_config->show_desktop_icons != cfdata->view.show_desktop_icons) ||
(fileman_config->view.show_toolbar != cfdata->view.show_toolbar) ||
(fileman_config->view.show_sidebar != cfdata->view.show_sidebar) ||
(fileman_config->view.desktop_navigation != cfdata->view.desktop_navigation) ||

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

@ -71,7 +71,7 @@ e_modapi_init(E_Module *m)
{
zone = lll->data;
if (e_fwin_zone_find(zone)) continue;
if (fileman_config->view.show_desktop_icons)
if (e_config->show_desktop_icons)
e_fwin_zone_new(zone, e_mod_fileman_path_find(zone));
}
}
@ -238,7 +238,6 @@ _e_mod_fileman_config_load(void)
E_CONFIG_VAL(D, T, view.link_drop, UCHAR);
E_CONFIG_VAL(D, T, view.fit_custom_pos, UCHAR);
E_CONFIG_VAL(D, T, view.show_full_path, UCHAR);
E_CONFIG_VAL(D, T, view.show_desktop_icons, UCHAR);
E_CONFIG_VAL(D, T, view.show_toolbar, UCHAR);
E_CONFIG_VAL(D, T, view.show_sidebar, UCHAR);
E_CONFIG_VAL(D, T, view.desktop_navigation, UCHAR);
@ -280,7 +279,7 @@ _e_mod_fileman_config_load(void)
{
fileman_config = E_NEW(Config, 1);
fileman_config->view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
fileman_config->view.show_desktop_icons = 1;
e_config->show_desktop_icons = 1;
fileman_config->icon.icon.w = 48;
fileman_config->icon.icon.h = 48;
fileman_config->icon.extension.show = 1;
@ -296,8 +295,6 @@ _e_mod_fileman_config_load(void)
fileman_config->icon.max_thumb_size = 5;
fileman_config->view.toolbar_orient = E_GADCON_ORIENT_TOP;
}
fileman_config->config_version = MOD_CONFIG_FILE_VERSION;
/* UCHAR's give nasty compile warnings about comparisons so not gonna limit those */
@ -347,7 +344,7 @@ _e_mod_zone_add(__UNUSED__ void *data,
ev = event;
zone = ev->zone;
if (e_fwin_zone_find(zone)) return ECORE_CALLBACK_PASS_ON;
if (fileman_config->view.show_desktop_icons)
if (e_config->show_desktop_icons)
e_fwin_zone_new(zone, e_mod_fileman_path_find(zone));
return ECORE_CALLBACK_PASS_ON;
}

1
src/modules/fileman/e_mod_main.h
View File

@ -34,7 +34,6 @@ struct _Config
unsigned char link_drop;
unsigned char fit_custom_pos;
unsigned char show_full_path;
unsigned char show_desktop_icons;
unsigned char show_toolbar;
unsigned char show_sidebar;
unsigned char desktop_navigation;