diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2010-02-22 05:16:11 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2010-02-22 05:16:11 +0000 |
commit | f11fd781d4ab66c79d01a384053da5c59c433689 (patch) | |
tree | 82db390cfc660570cc2354e0063ee9a10b7d35e1 | |
parent | 31eda597200bccbfa47dbe05f3f3735590c83a13 (diff) | |
download | rockbox-f11fd781d4ab66c79d01a384053da5c59c433689.tar.gz rockbox-f11fd781d4ab66c79d01a384053da5c59c433689.zip |
fix typo of wps and sbs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24841 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 20 | ||||
-rw-r--r-- | apps/settings_list.c | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/apps/settings.c b/apps/settings.c index 568e305655..ec6f0af4a4 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -754,17 +754,18 @@ void settings_apply_skins(void) | |||
754 | skin_font_init(); | 754 | skin_font_init(); |
755 | FOR_NB_SCREENS(i) | 755 | FOR_NB_SCREENS(i) |
756 | { | 756 | { |
757 | const char* setting; | 757 | const char* setting = global_settings.sbs_file; |
758 | const char* suffix = ".sbs"; | ||
758 | #ifdef HAVE_REMOTE_LCD | 759 | #ifdef HAVE_REMOTE_LCD |
759 | if (i == SCREEN_REMOTE) | 760 | if (i == SCREEN_REMOTE) |
761 | { | ||
760 | setting = global_settings.rsbs_file; | 762 | setting = global_settings.rsbs_file; |
761 | else | 763 | suffix = ".rsbs"; |
764 | } | ||
762 | #endif | 765 | #endif |
763 | setting = global_settings.sbs_file; | ||
764 | if (setting[0] && setting[0] != '-') | 766 | if (setting[0] && setting[0] != '-') |
765 | { | 767 | { |
766 | snprintf(buf, sizeof buf, SBS_DIR "/%s.%ssbs", setting, | 768 | snprintf(buf, sizeof buf, SBS_DIR "/%s%s", setting, suffix); |
767 | i == SCREEN_MAIN? "" : "r"); | ||
768 | sb_skin_data_load(i, buf, true); | 769 | sb_skin_data_load(i, buf, true); |
769 | } | 770 | } |
770 | else | 771 | else |
@@ -776,14 +777,17 @@ void settings_apply_skins(void) | |||
776 | FOR_NB_SCREENS(i) | 777 | FOR_NB_SCREENS(i) |
777 | { | 778 | { |
778 | const char* setting = global_settings.wps_file; | 779 | const char* setting = global_settings.wps_file; |
780 | const char* suffix = ".wps"; | ||
779 | #ifdef HAVE_REMOTE_LCD | 781 | #ifdef HAVE_REMOTE_LCD |
780 | if (i == SCREEN_REMOTE) | 782 | if (i == SCREEN_REMOTE) |
781 | setting = global_settings.rsbs_file; | 783 | { |
784 | setting = global_settings.rwps_file; | ||
785 | suffix = ".rwps"; | ||
786 | } | ||
782 | #endif | 787 | #endif |
783 | if (setting[0] && setting[0] != '-') | 788 | if (setting[0] && setting[0] != '-') |
784 | { | 789 | { |
785 | snprintf(buf, sizeof buf, WPS_DIR "/%s.%swps", setting, | 790 | snprintf(buf, sizeof buf, WPS_DIR "/%s%s", setting, suffix); |
786 | i == SCREEN_MAIN? "" : "r"); | ||
787 | wps_data_load(SCREEN_MAIN, buf, true); | 791 | wps_data_load(SCREEN_MAIN, buf, true); |
788 | } | 792 | } |
789 | else | 793 | else |
diff --git a/apps/settings_list.c b/apps/settings_list.c index c9a4fe36c4..fe1162e2b4 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -199,7 +199,7 @@ static const char graphic_numeric[] = "graphic,numeric"; | |||
199 | 199 | ||
200 | /* Default theme settings */ | 200 | /* Default theme settings */ |
201 | #define DEFAULT_WPSNAME "cabbiev2" | 201 | #define DEFAULT_WPSNAME "cabbiev2" |
202 | #define DEFAULT_SBS_NAME "-" | 202 | #define DEFAULT_SBSNAME "-" |
203 | 203 | ||
204 | #ifdef HAVE_LCD_BITMAP | 204 | #ifdef HAVE_LCD_BITMAP |
205 | 205 | ||
@@ -1440,13 +1440,13 @@ const struct settings_list settings[] = { | |||
1440 | DEFAULT_WPSNAME, WPS_DIR "/", ".wps"), | 1440 | DEFAULT_WPSNAME, WPS_DIR "/", ".wps"), |
1441 | #ifdef HAVE_LCD_BITMAP | 1441 | #ifdef HAVE_LCD_BITMAP |
1442 | TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs", | 1442 | TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs", |
1443 | DEFAULT_SBS_NAME, SBS_DIR "/", ".sbs"), | 1443 | DEFAULT_SBSNAME, SBS_DIR "/", ".sbs"), |
1444 | #endif | 1444 | #endif |
1445 | #ifdef HAVE_REMOTE_LCD | 1445 | #ifdef HAVE_REMOTE_LCD |
1446 | TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps", | 1446 | TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps", |
1447 | DEFAULT_SBS_NAME, WPS_DIR "/", ".rwps"), | 1447 | DEFAULT_WPSNAME, WPS_DIR "/", ".rwps"), |
1448 | TEXT_SETTING(F_THEMESETTING,rsbs_file, "rsbs", | 1448 | TEXT_SETTING(F_THEMESETTING,rsbs_file, "rsbs", |
1449 | DEFAULT_WPSNAME, SBS_DIR "/", ".rsbs"), | 1449 | DEFAULT_SBSNAME, SBS_DIR "/", ".rsbs"), |
1450 | #endif | 1450 | #endif |
1451 | TEXT_SETTING(0,lang_file,"lang","-",LANG_DIR "/",".lng"), | 1451 | TEXT_SETTING(0,lang_file,"lang","-",LANG_DIR "/",".lng"), |
1452 | #if LCD_DEPTH > 1 | 1452 | #if LCD_DEPTH > 1 |