rpms/control-center/F-11 gcc-xkb-init.patch, NONE, 1.1 control-center.spec, 1.446, 1.447

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24518

Modified Files:
	control-center.spec 
Added Files:
	gcc-xkb-init.patch 
Log Message:
Don't rely on _BACKUP property for xkb initialization



gcc-xkb-init.patch:

--- NEW FILE gcc-xkb-init.patch ---
diff -up gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c.xkb-init gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c
--- gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c.xkb-init	2009-04-29 21:53:58.375883837 -0400
+++ gnome-control-center-2.26.0/capplets/keyboard/gnome-keyboard-properties-xkb.c	2009-04-29 21:54:21.511849642 -0400
@@ -159,7 +159,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf
 
 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
 				   engine);
-	gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
+	gkbd_keyboard_config_load_from_x_current (&initial_config, NULL);
 
 	setup_model_entry (dialog);
 


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/control-center.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- control-center.spec	16 Apr 2009 16:15:14 -0000	1.446
+++ control-center.spec	30 Apr 2009 02:25:40 -0000	1.447
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -60,6 +60,8 @@ Patch35: gnome-control-center-2.26.0-sup
 # http://bugzilla.gnome.org/show_bug.cgi?id=578572
 Patch36: display-capplet-mnemonics.patch
 
+Patch37: gcc-xkb-init.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -185,6 +187,7 @@ utilities.
 %patch34 -p0 -b .new-icons
 %patch35 -p1 -b .support-touchpads
 %patch36 -p1 -b .mnemonics
+%patch37 -p1 -b .xkb-init
 pushd capplets/about-me
 mv *png icons/
 popd
@@ -360,6 +363,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-6
+- Don't rely on _BACKUP property for xkb initialization
+
 * Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
 - Disable the fingerprint enrollment if gdm-plugin-fingerprint
   isn't installed