1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Thomas Martitz 2009-10-19 16:12:42 +00:00
parent de7f241046
commit ee6557eeda
2 changed files with 2 additions and 6 deletions

View file

@ -488,7 +488,6 @@ int ft_enter(struct tree_context* c)
MAX_FILENAME); MAX_FILENAME);
global_settings.statusbar = STATUSBAR_CUSTOM; global_settings.statusbar = STATUSBAR_CUSTOM;
settings_apply_skins(); settings_apply_skins();
viewportmanager_theme_changed(THEME_STATUSBAR);
break; break;
#endif #endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
@ -498,7 +497,6 @@ int ft_enter(struct tree_context* c)
MAX_FILENAME); MAX_FILENAME);
global_settings.remote_statusbar = STATUSBAR_CUSTOM; global_settings.remote_statusbar = STATUSBAR_CUSTOM;
settings_apply_skins(); settings_apply_skins();
viewportmanager_theme_changed(THEME_STATUSBAR);
break; break;
#endif #endif
/* wps config file */ /* wps config file */
@ -507,7 +505,6 @@ int ft_enter(struct tree_context* c)
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
backdrop_unload(BACKDROP_SKIN_WPS); backdrop_unload(BACKDROP_SKIN_WPS);
#endif #endif
wps_data_load(SCREEN_MAIN, buf, true);
set_file(buf, (char *)global_settings.wps_file, set_file(buf, (char *)global_settings.wps_file,
MAX_FILENAME); MAX_FILENAME);
settings_apply_skins(); settings_apply_skins();
@ -520,7 +517,6 @@ int ft_enter(struct tree_context* c)
#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
remote_backdrop_unload(BACKDROP_SKIN_WPS); remote_backdrop_unload(BACKDROP_SKIN_WPS);
#endif #endif
wps_data_load(SCREEN_REMOTE, buf, true);
set_file(buf, (char *)global_settings.rwps_file, set_file(buf, (char *)global_settings.rwps_file,
MAX_FILENAME); MAX_FILENAME);
settings_apply_skins(); settings_apply_skins();

View file

@ -745,7 +745,7 @@ void settings_apply_skins(void)
if ( global_settings.sbs_file[0] && if ( global_settings.sbs_file[0] &&
global_settings.sbs_file[0] != 0xff ) 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); global_settings.sbs_file);
sb_skin_data_load(SCREEN_MAIN, buf, true); 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 defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
if ( global_settings.rsbs_file[0] && if ( global_settings.rsbs_file[0] &&
global_settings.rsbs_file[0] != 0xff ) { 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); global_settings.rsbs_file);
sb_skin_data_load(SCREEN_REMOTE, buf, true); sb_skin_data_load(SCREEN_REMOTE, buf, true);
} }