From e4689fd18ed7410ad297756c5267dd073d41ae1c Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Wed, 21 Mar 2007 07:26:07 +0000
Subject: [PATCH] revert the last commit... setting wasnt worth the space

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12874 a1c6a512-1295-4272-9138-f99709370657
---
 apps/lang/english.lang    | 14 --------------
 apps/menus/display_menu.c |  3 +--
 apps/plugin.c             | 11 ++---------
 apps/settings.h           |  4 +---
 apps/settings_list.c      |  5 +----
 5 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 1046d34f1a..5cc37485bc 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -10725,17 +10725,3 @@
     *: ""
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BACKLIGHT_IN_PLUGINS
-  desc: in lcd settings
-  user:
-  <source>
-    *: "Backlight (In Plugins)"
-  </source>
-  <dest>
-    *: "Backlight (In Plugins)"
-  </dest>
-  <voice>
-    *: "Backlight in plugins"
-  </voice>
-</phrase>
\ No newline at end of file
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index bab3f6d3b4..4cdb5b7fce 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -79,7 +79,6 @@ int flipdisplay_callback(int action,const struct menu_item_ex *this_item)
 /*    LCD MENU                     */
 #if CONFIG_BACKLIGHT
 MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL);
-MENUITEM_SETTING(backlight_in_plugins, &global_settings.backlight_in_plugins, NULL);
 #if CONFIG_CHARGING
 MENUITEM_SETTING(backlight_timeout_plugged, 
                 &global_settings.backlight_timeout_plugged, NULL);
@@ -181,7 +180,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
 # ifdef HAS_BUTTON_HOLD
             ,&backlight_on_button_hold
 # endif
-            ,&caption_backlight, &backlight_in_plugins
+            ,&caption_backlight
 # if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
             ,&backlight_fade_in, &backlight_fade_out
 # endif
diff --git a/apps/plugin.c b/apps/plugin.c
index 851ce5d0a4..1a5ee4e3f7 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -609,17 +609,10 @@ int plugin_load(const char* plugin, void* parameter)
 #endif
 
     invalidate_icache();
-#if CONFIG_BACKLIGHT
-    if (global_settings.backlight_in_plugins == 1)
-        backlight_set_timeout(1);
-#endif
+
     rc = hdr->entry_point((struct plugin_api*) &rockbox_api, parameter);
     /* explicitly casting the pointer here to avoid touching every plugin. */
-#if CONFIG_BACKLIGHT
-    if (global_settings.backlight_in_plugins == 1)
-      backlight_set_timeout(global_settings.backlight_timeout);
-#endif
-    
+
     button_clear_queue();
 
 #ifdef HAVE_LCD_BITMAP
diff --git a/apps/settings.h b/apps/settings.h
index c824360dc4..f9e08152af 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -704,9 +704,7 @@ struct user_settings
     (defined(HAVE_RECORDING) || CONFIG_TUNER)
     int alarm_wake_up_screen;
 #endif
-#if CONFIG_BACKLIGHT
-    int backlight_in_plugins;
-#endif
+
 };
 
 /** global variables **/
diff --git a/apps/settings_list.c b/apps/settings_list.c
index a359990cff..4dce7ae157 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -971,10 +971,7 @@ const struct settings_list settings[] = {
         "normal,off,on", backlight_set_on_button_hold, 3,
         ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)),
 #endif
-    CHOICE_SETTING(0, backlight_in_plugins,
-        LANG_BACKLIGHT_IN_PLUGINS, 0, "backlight in settings",
-        "normal,on", NULL, 2,
-        ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_ON)),
+
 #ifdef HAVE_LCD_SLEEP
     STRINGCHOICE_SETTING(0, lcd_sleep_after_backlight_off,
         LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF, 3,