From 11064c0e35e1dd614166f2e4df51e13ac81f5e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 9 Feb 2011 02:22:42 +0100
Subject: [PATCH] kbd-status: Remove support for disabling the indicator

The status icon should always be visible if more than two layouts
are configured. The settings key which was used to enforce hiding
the icon in this case as well has already been removed from the
g-s-d schema, causing an error on startup.
---
 js/ui/status/keyboard.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 6e6ccee54..111c3c015 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -15,8 +15,6 @@ const PanelMenu = imports.ui.panelMenu;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
-const INDICATOR_SCHEMA = 'org.gnome.settings-daemon.plugins.keyboard';
-
 function LayoutMenuItem() {
     this._init.apply(this, arguments);
 }
@@ -62,10 +60,6 @@ XKBIndicator.prototype = {
         this._labelActors = [ ];
         this._layoutItems = [ ];
 
-        this._indicatorSettings = new Gio.Settings({ schema: INDICATOR_SCHEMA });
-        this._indicatorSettings.connect('changed::disable-indicator', Lang.bind(this, this._sync_config));
-
-        this._disableIndicator = false;
         this._showFlags = false;
         this._config = Gkbd.Configuration.get();
         this._config.connect('changed', Lang.bind(this, this._sync_config));
@@ -81,8 +75,6 @@ XKBIndicator.prototype = {
     },
 
     _sync_config: function() {
-        this._disableIndicator = this._indicatorSettings.get_boolean('disable-indicator');
-
         this._showFlags = this._config.if_flags_shown();
         if (this._showFlags) {
             this._container.set_skip_paint(this._iconActor, false);
@@ -91,7 +83,7 @@ XKBIndicator.prototype = {
         }
 
         let groups = this._config.get_group_names();
-        if (groups.length > 1 && !this._disableIndicator) {
+        if (groups.length > 1) {
             this.actor.show();
         } else {
             this.menu.close();