[gnome-shell] kbd-status: Remove support for disabling the indicator
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] kbd-status: Remove support for disabling the indicator
- Date: Wed, 9 Feb 2011 01:41:30 +0000 (UTC)
commit 11064c0e35e1dd614166f2e4df51e13ac81f5e2b
Author: Florian Müllner <fmuellner gnome org>
Date: Wed Feb 9 02:22:42 2011 +0100
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 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 6e6ccee..111c3c0 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();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]