1 files changed, 26 insertions, 16 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 7c80e5c6e1..adf207da79 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -352,7 +352,6 @@ static const struct plugin_api rockbox_api = {
     yesno_pop,
 
     /* action handling */
-    list_do_action,
     get_custom_action,
     get_action,
 #ifdef HAVE_TOUCHSCREEN
@@ -422,6 +421,7 @@ static const struct plugin_api rockbox_api = {
     crc_32,
     crc_32r,
     filetype_get_attr,
+    filetype_get_plugin,
 
     /* dir */
     FS_PREFIX(opendir),
@@ -582,6 +582,9 @@ static const struct plugin_api rockbox_api = {
     utf8length,
     utf8seek,
 
+    /* language */
+    lang_is_rtl,
+
     /* the buflib memory management library */
     buflib_init,
     buflib_available,
@@ -665,7 +668,7 @@ static const struct plugin_api rockbox_api = {
 
     /* metadata */
     get_metadata,
-    mp3info,
+    get_codec_string,
     count_mp3_frames,
     create_xing_header,
 #ifdef HAVE_TAGCACHE
@@ -677,6 +680,7 @@ static const struct plugin_api rockbox_api = {
     tagcache_search_finish,
     tagcache_get_numeric,
     tagcache_get_stat,
+    tagcache_commit_finalize,
 #if defined(HAVE_TC_RAMCACHE)
     tagcache_is_in_ram,
 #if defined(HAVE_DIRCACHE)
@@ -694,6 +698,9 @@ static const struct plugin_api rockbox_api = {
     playlist_get_current,
     playlist_get_resume_info,
     playlist_get_track_info,
+    playlist_get_first_index,
+    playlist_get_display_index,
+    playlist_entries_iterate,
     playlist_amount,
     playlist_resume,
     playlist_resume_track,
@@ -833,14 +840,8 @@ static const struct plugin_api rockbox_api = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef HAVE_TAGCACHE
-    tagcache_commit_finalize,
-#endif
-    playlist_get_first_index,
-    playlist_get_display_index,
-    filetype_get_plugin,
-    playlist_entries_iterate,
-    lang_is_rtl,
+
+    talk_fullpath,
 };
 
 static int plugin_buffer_handle;
@@ -855,6 +856,10 @@ int plugin_load(const char* plugin, const void* parameter)
     if (!plugin)
         return PLUGIN_ERROR;
 
+    /* for some plugins, the SBS can be left enabled */
+    const char *sepch = strrchr(plugin, PATH_SEPCH);
+    bool theme_enabled = sepch && !strcmp("properties.rock", sepch + 1);
+
     if (current_plugin_handle && pfn_tsr_exit)
     {    /* if we have a resident old plugin and a callback */
         bool reenter = (strcmp(current_plugin, plugin) == 0);
@@ -922,7 +927,8 @@ int plugin_load(const char* plugin, const void* parameter)
 
     *(p_hdr->api) = &rockbox_api;
     lcd_set_viewport(NULL);
-    lcd_clear_display();
+    if (!theme_enabled)
+        lcd_clear_display();
 
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_set_viewport(NULL);
@@ -937,8 +943,9 @@ int plugin_load(const char* plugin, const void* parameter)
      * they should be fixed properly instead of this lock */
     tree_lock_cache(tree_get_context());
 
-    FOR_NB_SCREENS(i)
-       viewportmanager_theme_enable(i, false, NULL);
+    if (!theme_enabled)
+        FOR_NB_SCREENS(i)
+            viewportmanager_theme_enable(i, false, NULL);
 
 #ifdef HAVE_TOUCHSCREEN
     touchscreen_set_mode(TOUCHSCREEN_BUTTON);
@@ -999,13 +1006,16 @@ int plugin_load(const char* plugin, const void* parameter)
 #endif
 #endif
 
-    lcd_clear_display();
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_clear_display();
 #endif
 
-    FOR_NB_SCREENS(i)
-        viewportmanager_theme_undo(i, true);
+    if (!theme_enabled)
+    {
+        lcd_clear_display();
+        FOR_NB_SCREENS(i)
+            viewportmanager_theme_undo(i, true);
+    }
 
     plugin_check_open_close__exit();