Bug#287965: gconf way to disable the warning

[Gerfried Fuchs]

--tKW2IUtsqtDRztdT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Gerfried Fuchs <alfie@ist.org> [2005-01-11 10:43]:
> * Margarita Manterola <debian@marga.com.ar> [2005-01-04 15:01]:
>> While looking for a way to actually fix this bug, I found this piece
>> of code in the file gnome-settings-keyboard-xkb.c:
>>=20
>> static const char DISABLE_XMM_WARNING_KEY[] =3D
>>     "/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning";
>=20
>  Maybe the call to activation_error in here should be wrapped in an if
> statement?  I *think* the following patch might solve it, using this
> key:

 And it did (though I needed to tweak it a little bit).  Here is the
interdiff:

#v+
diff -u control-center-2.8.1/debian/changelog control-center-2.8.1/debian/c=
hangelog
--- control-center-2.8.1/debian/changelog
+++ control-center-2.8.1/debian/changelog
@@ -1,3 +1,9 @@
+control-center (1:2.8.1-3.0) unstable; urgency=3Dlow
+
+  * Workaround testbuild for #287965.
+
+ -- Gerfried Fuchs <alfie@debian.org>  Tue, 01 Feb 2005 16:01:17 +0100
+
 control-center (1:2.8.1-3) unstable; urgency=3Dlow
=20
   * debian/rules:
only in patch2:
unchanged:
--- control-center-2.8.1.orig/gnome-settings-daemon/gnome-settings-keyboard=
-xkb.c
+++ control-center-2.8.1/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
@@ -113,6 +113,9 @@
 				(*paCallback) (paCallbackUserData);
 			}
 		} else {
+			if (gconf_client_get_bool (gconf_client_get_default (),
+						DISABLE_XMM_WARNING_KEY, NULL))
+				return;
 			g_warning
 			    ("Could not activate the XKB configuration");
 			activation_error ();
#v-

 It at least works for me. You might want to discuss this upstream, and
find a different workaround, but I guess that would be quite propably
too late for the sarge release. I can't really see any drawback in that
solution, maybe only a misuse of the key, on the other hand it _is_
called disable_xmm_*and_xkb*_warning....

 Thanks.
Alf*no need to add me to authors file for that patch ;)*ie
--=20
"Netscape is not a newsreader, and probably never shall be."
                -- Tom Christiansen

--tKW2IUtsqtDRztdT
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFB/6nCMU96lewVKUIRArHeAJ0Roe+hfTipo0gubHYSUCiisxsvkgCfUslg
Nu5gZsyabSKwbP2luM4m9bc=
=+Ueb
-----END PGP SIGNATURE-----

--tKW2IUtsqtDRztdT--