From 5de91197ae68e9986f2220fa14b218592c54f1d0 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 24 Nov 2012 16:38:21 +0100 Subject: [PATCH] status/keyboard: remove the property whitelist It was just a stopgap solution for 3.6, as the necessary UI bits were not implemented. https://bugzilla.gnome.org/show_bug.cgi?id=682318 --- js/ui/status/keyboard.js | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js index cf036ac57..a5b827ad8 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js @@ -185,12 +185,6 @@ const InputSourceIndicator = new Lang.Class({ Name: 'InputSourceIndicator', Extends: PanelMenu.Button, - _propertiesWhitelist: [ - 'InputMode', - 'TypingMode', - 'DictMode' - ], - _init: function() { this.parent(0.0, _("Keyboard")); @@ -394,24 +388,12 @@ const InputSourceIndicator = new Lang.Class({ return String.fromCharCode(0x2328); // keyboard glyph }, - _propertyWhitelisted: function(prop) { - for (let i = 0; i < this._propertiesWhitelist.length; ++i) { - let key = prop.get_key(); - if (key.substr(0, this._propertiesWhitelist[i].length) == this._propertiesWhitelist[i]) - return true; - } - return false; - }, - _ibusPropertiesRegistered: function(im, props) { this._properties = props; this._buildPropSection(); }, _ibusPropertyUpdated: function(im, prop) { - if (!this._propertyWhitelisted(prop)) - return; - if (this._updateSubProperty(this._properties, prop)) this._buildPropSection(); }, @@ -468,8 +450,7 @@ const InputSourceIndicator = new Lang.Class({ for (let i = 0; (p = props.get(i)) != null; ++i) { let prop = p; - if (!this._propertyWhitelisted(prop) || - !prop.get_visible()) + if (!prop.get_visible()) continue; if (prop.get_key() == 'InputMode') {