diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-11-18 09:03:25 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-11-18 09:03:25 +0000 |
commit | 09fce707c117aa4006ca30a5a0bf9eb7a89e2caa (patch) | |
tree | 9345d5f6d7d06e122520347a3d9fa3127d3bd4fe /apps/settings.c | |
parent | fe2c40aedb514126605d5c370ad9792cceadac57 (diff) | |
download | rockbox-09fce707c117aa4006ca30a5a0bf9eb7a89e2caa.tar.gz rockbox-09fce707c117aa4006ca30a5a0bf9eb7a89e2caa.zip |
Missing file headers put back. Code within 80 cols. Code policed indenting
and style. Simplified struct levels. #if 0'ed unused functions. Made private
stuff static.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7954 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/settings.c b/apps/settings.c index 2e5014fce7..36bd332ae3 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -890,20 +890,20 @@ void settings_apply(void) | |||
890 | global_settings.wps_file[0] != 0xff ) { | 890 | global_settings.wps_file[0] != 0xff ) { |
891 | snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", | 891 | snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", |
892 | global_settings.wps_file); | 892 | global_settings.wps_file); |
893 | wps_data_load(gui_syncwps.gui_wps[0].data, buf, true, false); | 893 | wps_data_load(gui_wps[0].data, buf, true, false); |
894 | } | 894 | } |
895 | else | 895 | else |
896 | wps_data_init(gui_syncwps.gui_wps[0].data); | 896 | wps_data_init(gui_wps[0].data); |
897 | 897 | ||
898 | #ifdef HAVE_REMOTE_LCD | 898 | #ifdef HAVE_REMOTE_LCD |
899 | if ( global_settings.rwps_file[0] && | 899 | if ( global_settings.rwps_file[0] && |
900 | global_settings.rwps_file[0] != 0xff ) { | 900 | global_settings.rwps_file[0] != 0xff ) { |
901 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", | 901 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", |
902 | global_settings.rwps_file); | 902 | global_settings.rwps_file); |
903 | wps_data_load(gui_syncwps.gui_wps[1].data, buf, true, false); | 903 | wps_data_load(gui_wps[1].data, buf, true, false); |
904 | } | 904 | } |
905 | else | 905 | else |
906 | wps_data_init(gui_syncwps.gui_wps[1].data); | 906 | wps_data_init(gui_wps[1].data); |
907 | #endif | 907 | #endif |
908 | 908 | ||
909 | #ifdef HAVE_LCD_BITMAP | 909 | #ifdef HAVE_LCD_BITMAP |
@@ -1166,12 +1166,12 @@ bool settings_load_config(const char* file) | |||
1166 | 1166 | ||
1167 | /* check for the string values */ | 1167 | /* check for the string values */ |
1168 | if (!strcasecmp(name, "wps")) { | 1168 | if (!strcasecmp(name, "wps")) { |
1169 | if (wps_data_load(gui_syncwps.gui_wps[0].data,value,true, false)) | 1169 | if (wps_data_load(gui_wps[0].data,value,true, false)) |
1170 | set_file(value, global_settings.wps_file, MAX_FILENAME); | 1170 | set_file(value, global_settings.wps_file, MAX_FILENAME); |
1171 | } | 1171 | } |
1172 | #ifdef HAVE_REMOTE_LCD | 1172 | #ifdef HAVE_REMOTE_LCD |
1173 | else if (!strcasecmp(name, "rwps")) { | 1173 | else if (!strcasecmp(name, "rwps")) { |
1174 | if (wps_data_load(gui_syncwps.gui_wps[1].data,value,true, false)) | 1174 | if (wps_data_load(gui_wps[1].data,value,true, false)) |
1175 | set_file(value, global_settings.rwps_file, MAX_FILENAME); | 1175 | set_file(value, global_settings.rwps_file, MAX_FILENAME); |
1176 | } | 1176 | } |
1177 | #endif | 1177 | #endif |