[PATCH] Don't fetch disable-indicator key

[Guido Günther]

---
 js/ui/status/keyboard.js |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 6e6ccee..2bf35a5 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -62,9 +62,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();
@@ -81,7 +78,7 @@ XKBIndicator.prototype = {
     },
 
     _sync_config: function() {
-        this._disableIndicator = this._indicatorSettings.get_boolean('disable-indicator');
+        this._disableIndicator = false;
 
         this._showFlags = this._config.if_flags_shown();
         if (this._showFlags) {
-- 
1.7.4.1


--Dxnq1zWXvFF0Q93v--



------------=_1298823849-25385-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at 614935-done) by bugs.debian.org; 27 Feb 2011 16:20:41 +0000
X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02
	(2008-06-10) on busoni.debian.org
X-Spam-Level: 
X-Spam-Bayes: score:0.0000 Tokens: new, 13; hammy, 137; neutral, 42; spammy,
	0. spammytokens: hammytokens:0.000-+--H*f:sk:2011022,
	0.000-+--HX-Enigmail-Version:1.1.2, 0.000-+--gnther, 0.000-+--Gnther,
	0.000-+--H*i:sk:2011022
X-Spam-Status: No, score=-9.8 required=4.0 tests=BAYES_00,FROMDEVELOPER,
	HAS_BUG_NUMBER,RCVD_IN_DNSWL_LOW,SPF_PASS,VERSION autolearn=ham
	version=3.2.5-bugs.debian.org_2005_01_02
Return-path: <pochu27 at gmail.com>
Received: from mail-bw0-f52.google.com ([209.85.214.52])
	by busoni.debian.org with esmtps (TLS1.0:RSA_ARCFOUR_MD5:16)
	(Exim 4.69)
	(envelope-from <pochu27 at gmail.com>)
	id 1PtjMP-0006RF-3k
	for 614935-done at bugs.debian.org; Sun, 27 Feb 2011 16:20:41 +0000
Received: by bwj24 with SMTP id 24so3433983bwj.11
        for <614935-done at bugs.debian.org>; Sun, 27 Feb 2011 08:20:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:sender:message-id:date:from:user-agent
         :mime-version:to:subject:references:in-reply-to:x-enigmail-version
         :content-type:content-transfer-encoding;
        bh=szSsUApsEQaQVtlFGzN8tPqsIkar41Jl6/tyFqYExwc=;
        b=Iny6EtSjpbcW0t2M4oqgtY9an9tsGMPVKrpb2mWMMSOISeujvt+FRibJxRGyPrAV28
         glUwjZYsmHRGRFeZT5ugMy5Z+I6zoLbSRYK1vXYo2Tw/T4nIMRVBJ6cfygoRNZSZVkSy
         aOoEpcnK0x7LNziFGWTqOaf9UU3THYsBE/XRc=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=sender:message-id:date:from:user-agent:mime-version:to:subject
         :references:in-reply-to:x-enigmail-version:content-type
         :content-transfer-encoding;
        b=ifFnClM+c6Sm3VUAfEOVeP3ICKIy9+M9wht/uNcPVpdjbzaUtwXWNpmDIyA6JTurli
         py4tTGYkKFLVJ4po+tHBZiW8kyCoKWtHgl1/Ccb3v4uBL+5ZYiNIoVFfD2lTYZosWH+Z
         CYaUoplDwSCcF7sLTtzaOYHJXLKDHBJBRuniQ=
Received: by 10.204.77.199 with SMTP id h7mr3964083bkk.79.1298823633188;
        Sun, 27 Feb 2011 08:20:33 -0800 (PST)
Received: from [192.168.1.35] (179.Red-88-11-168.dynamicIP.rima-tde.net [88.11.168.179])
        by mx.google.com with ESMTPS id f20sm1888441bkf.16.2011.02.27.08.20.30
        (version=SSLv3 cipher=OTHER);
        Sun, 27 Feb 2011 08:20:31 -0800 (PST)
Sender: Emilio Pozuelo Monfort <pochu27 at gmail.com>
Message-ID: <4D6A799C.70504 at debian.org>
Date: Sun, 27 Feb 2011 16:19:40 +0000
From: Emilio Pozuelo Monfort <pochu at debian.org>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101213 Iceowl/1.0b2 Icedove/3.1.7
MIME-Version: 1.0
To: =?UTF-8?B?R3VpZG8gR8O8bnRoZXI=?= <agx at sigxcpu.org>, 
 614935-done at bugs.debian.org
Subject: Re: Bug#614935: Fails to start - dconf key missing in schema
References: <20110224114800.GA18585 at bogon.sigxcpu.org>
In-Reply-To: <20110224114800.GA18585 at bogon.sigxcpu.org>
X-Enigmail-Version: 1.1.2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Version: 2.91.90-1

On 24/02/11 11:48, Guido Günther wrote:
> Hi,
> after upgrading from 2.91.5 to 2.91.6 the shell fails to start:
> 
> ~$ gnome-shell --replace
> Window manager warning: Workarounds for broken applications disabled. Some applications may not behave properly.
>       JS LOG: Cannot create "Network" item, .desktop file not found or corrupt.
> 
> GLib-GIO-ERROR **: Settings schema 'org.gnome.settings-daemon.plugins.keyboard' does not contain a key named 'disable-indicator'
> aborting...
> Shell killed with signal 6

2.91.90 no longer looks at this key.

Cheers,
Emilio


------------=_1298823849-25385-0--