[gnome-settings-daemon] keyboard: Match shell behaviour for visibility

[Bastien Nocera <hadess src gnome org>]

commit a55c7d9124f947f06e299be78886e350b2128975
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 9 00:39:31 2011 +0000

    keyboard: Match shell behaviour for visibility
    
    The status icon is now always shown if there are 2 or more layouts,
    just like the GNOME-shell one.

 data/gnome-settings-daemon.convert                 |    1 -
 ...tings-daemon.plugins.keyboard.gschema.xml.in.in |    5 -----
 plugins/keyboard/gsd-keyboard-xkb.c                |   14 --------------
 3 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index 38bba27..620e710 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -42,7 +42,6 @@ priority = /apps/gnome_settings_daemon/plugins/keybindings/priority
 [org.gnome.settings-daemon.plugins.keyboard]
 active = /apps/gnome_settings_daemon/plugins/keyboard/active
 priority = /apps/gnome_settings_daemon/plugins/keyboard/priority
-disable-indicator = /desktop/gnome/peripherals/keyboard/general/disable_indicator
 show-keyboard-leds-indicator = /desktop/gnome/peripherals/keyboard/general/duplicate_leds
 
 [org.gnome.settings-daemon.plugins.media-keys]
diff --git a/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
index 9dbc55d..aa51117 100644
--- a/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
@@ -10,10 +10,5 @@
       <_summary>Priority to use for this plugin</_summary>
       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue.</_description>
     </key>
-    <key name="disable-indicator" type="b">
-      <default>false</default>
-      <_summary>Never show layout indicator</_summary>
-      <_description>Disable the keyboard layout indicator unconditionally, do not show it even if number of layouts is more than one.</_description>
-    </key>
   </schema>
 </schemalist>
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index 6d6021b..d2066fc 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -42,8 +42,6 @@
 
 #define SETTINGS_KEYBOARD_DIR "org.gnome.settings-daemon.plugins.keyboard"
 
-#define DISABLE_INDICATOR_KEY "disable-indicator"
-
 static GsdKeyboardManager *manager = NULL;
 
 static XklEngine *xkl_engine;
@@ -57,7 +55,6 @@ static GkbdKeyboardConfig initial_sys_kbd_config;
 
 static gboolean inited_ok = FALSE;
 
-static GSettings *settings_plugin = NULL;
 static GSettings *settings_desktop = NULL;
 static GSettings *settings_keyboard = NULL;
 
@@ -280,13 +277,6 @@ show_hide_icon ()
 {
 	if (g_strv_length (current_kbd_config.layouts_variants) > 1) {
 		if (icon == NULL) {
-			if (g_settings_get_boolean (settings_plugin, DISABLE_INDICATOR_KEY))
-			{
-				xkl_debug (150,
-					   "Not creating keyboard status icon: disabled in GSettings\n");
-				return;
-			}
-
 			xkl_debug (150, "Creating keyboard status icon\n");
 			icon = gkbd_status_new ();
 			g_signal_connect (icon, "popup-menu",
@@ -463,8 +453,6 @@ gsd_keyboard_xkb_init (GsdKeyboardManager * kbd_manager)
 	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 	gnome_settings_profile_start (NULL);
 
-	settings_plugin = g_settings_new (SETTINGS_KEYBOARD_DIR);
-
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
 					   DATADIR G_DIR_SEPARATOR_S
 					   "icons");
@@ -544,8 +532,6 @@ gsd_keyboard_xkb_shutdown (void)
 	settings_desktop = NULL;
 	g_object_unref (settings_keyboard);
 	settings_keyboard = NULL;
-	g_object_unref (settings_plugin);
-	settings_plugin = NULL;
 
 	if (xkl_registry) {
 		g_object_unref (xkl_registry);