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

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)
                          MAX_FILENAME);
                 global_settings.statusbar = STATUSBAR_CUSTOM;
                 settings_apply_skins();
-                viewportmanager_theme_changed(THEME_STATUSBAR);
                 break;
 #endif
 #ifdef HAVE_REMOTE_LCD
@@ -498,7 +497,6 @@ int ft_enter(struct tree_context* c)
                          MAX_FILENAME);
                 global_settings.remote_statusbar = STATUSBAR_CUSTOM;
                 settings_apply_skins();
-                viewportmanager_theme_changed(THEME_STATUSBAR);
                 break;
 #endif
                 /* wps config file */
@@ -507,7 +505,6 @@ int ft_enter(struct tree_context* c)
 #if LCD_DEPTH > 1
                 backdrop_unload(BACKDROP_SKIN_WPS);
 #endif
-                wps_data_load(SCREEN_MAIN, buf, true);
                 set_file(buf, (char *)global_settings.wps_file,
                          MAX_FILENAME);
                 settings_apply_skins();
@@ -520,7 +517,6 @@ int ft_enter(struct tree_context* c)
 #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
                 remote_backdrop_unload(BACKDROP_SKIN_WPS);
 #endif
-                wps_data_load(SCREEN_REMOTE, buf, true);
                 set_file(buf, (char *)global_settings.rwps_file,
                          MAX_FILENAME);
                 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)
     if ( global_settings.sbs_file[0] &&
         global_settings.sbs_file[0] != 0xff )
     {
-        snprintf(buf, sizeof buf, WPS_DIR "/%s.sbs",
+        snprintf(buf, sizeof buf, SBS_DIR "/%s.sbs",
                 global_settings.sbs_file);
         sb_skin_data_load(SCREEN_MAIN, buf, true);
     }
@@ -768,7 +768,7 @@ void settings_apply_skins(void)
 #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
     if ( global_settings.rsbs_file[0] &&
         global_settings.rsbs_file[0] != 0xff ) {
-        snprintf(buf, sizeof buf, WPS_DIR "/%s.rsbs",
+        snprintf(buf, sizeof buf, SBS_DIR "/%s.rsbs",
                 global_settings.rsbs_file);
         sb_skin_data_load(SCREEN_REMOTE, buf, true);
     }