diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-10-19 16:12:42 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-19 16:12:42 +0000 |
commit | ee6557eeda8aeefa6db169f633ecdb7755dba247 (patch) | |
tree | 42111f206cda9390ed5868a9b9ebc0e4ef450825 | |
parent | de7f24104650a03590d009be28283e9b361d6652 (diff) | |
download | rockbox-ee6557eeda8aeefa6db169f633ecdb7755dba247.tar.gz rockbox-ee6557eeda8aeefa6db169f633ecdb7755dba247.zip |
Remove a few superfluous calls and use the correct symbol.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23262 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/filetree.c | 4 | ||||
-rw-r--r-- | apps/settings.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index 1f7559f5fe..3b31358321 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -488,7 +488,6 @@ int ft_enter(struct tree_context* c) | |||
488 | MAX_FILENAME); | 488 | MAX_FILENAME); |
489 | global_settings.statusbar = STATUSBAR_CUSTOM; | 489 | global_settings.statusbar = STATUSBAR_CUSTOM; |
490 | settings_apply_skins(); | 490 | settings_apply_skins(); |
491 | viewportmanager_theme_changed(THEME_STATUSBAR); | ||
492 | break; | 491 | break; |
493 | #endif | 492 | #endif |
494 | #ifdef HAVE_REMOTE_LCD | 493 | #ifdef HAVE_REMOTE_LCD |
@@ -498,7 +497,6 @@ int ft_enter(struct tree_context* c) | |||
498 | MAX_FILENAME); | 497 | MAX_FILENAME); |
499 | global_settings.remote_statusbar = STATUSBAR_CUSTOM; | 498 | global_settings.remote_statusbar = STATUSBAR_CUSTOM; |
500 | settings_apply_skins(); | 499 | settings_apply_skins(); |
501 | viewportmanager_theme_changed(THEME_STATUSBAR); | ||
502 | break; | 500 | break; |
503 | #endif | 501 | #endif |
504 | /* wps config file */ | 502 | /* wps config file */ |
@@ -507,7 +505,6 @@ int ft_enter(struct tree_context* c) | |||
507 | #if LCD_DEPTH > 1 | 505 | #if LCD_DEPTH > 1 |
508 | backdrop_unload(BACKDROP_SKIN_WPS); | 506 | backdrop_unload(BACKDROP_SKIN_WPS); |
509 | #endif | 507 | #endif |
510 | wps_data_load(SCREEN_MAIN, buf, true); | ||
511 | set_file(buf, (char *)global_settings.wps_file, | 508 | set_file(buf, (char *)global_settings.wps_file, |
512 | MAX_FILENAME); | 509 | MAX_FILENAME); |
513 | settings_apply_skins(); | 510 | settings_apply_skins(); |
@@ -520,7 +517,6 @@ int ft_enter(struct tree_context* c) | |||
520 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 517 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 |
521 | remote_backdrop_unload(BACKDROP_SKIN_WPS); | 518 | remote_backdrop_unload(BACKDROP_SKIN_WPS); |
522 | #endif | 519 | #endif |
523 | wps_data_load(SCREEN_REMOTE, buf, true); | ||
524 | set_file(buf, (char *)global_settings.rwps_file, | 520 | set_file(buf, (char *)global_settings.rwps_file, |
525 | MAX_FILENAME); | 521 | MAX_FILENAME); |
526 | settings_apply_skins(); | 522 | settings_apply_skins(); |
diff --git a/apps/settings.c b/apps/settings.c index f0d3d31b30..7a36a0ee1d 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -745,7 +745,7 @@ void settings_apply_skins(void) | |||
745 | if ( global_settings.sbs_file[0] && | 745 | if ( global_settings.sbs_file[0] && |
746 | global_settings.sbs_file[0] != 0xff ) | 746 | global_settings.sbs_file[0] != 0xff ) |
747 | { | 747 | { |
748 | snprintf(buf, sizeof buf, WPS_DIR "/%s.sbs", | 748 | snprintf(buf, sizeof buf, SBS_DIR "/%s.sbs", |
749 | global_settings.sbs_file); | 749 | global_settings.sbs_file); |
750 | sb_skin_data_load(SCREEN_MAIN, buf, true); | 750 | sb_skin_data_load(SCREEN_MAIN, buf, true); |
751 | } | 751 | } |
@@ -768,7 +768,7 @@ void settings_apply_skins(void) | |||
768 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 768 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
769 | if ( global_settings.rsbs_file[0] && | 769 | if ( global_settings.rsbs_file[0] && |
770 | global_settings.rsbs_file[0] != 0xff ) { | 770 | global_settings.rsbs_file[0] != 0xff ) { |
771 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rsbs", | 771 | snprintf(buf, sizeof buf, SBS_DIR "/%s.rsbs", |
772 | global_settings.rsbs_file); | 772 | global_settings.rsbs_file); |
773 | sb_skin_data_load(SCREEN_REMOTE, buf, true); | 773 | sb_skin_data_load(SCREEN_REMOTE, buf, true); |
774 | } | 774 | } |