rpms/control-center/devel gnome-control-center-2.22.0-caps-lock-bindables.patch, NONE, 1.1 gnome-control-center-2.22.0-keybinding-xml-encoding.patch, NONE, 1.1 control-center.spec, 1.348, 1.349

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8683

Modified Files:
	control-center.spec 
Added Files:
	gnome-control-center-2.22.0-caps-lock-bindables.patch 
	gnome-control-center-2.22.0-keybinding-xml-encoding.patch 
Log Message:
* Mon Mar 31 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-3
- Fix warnings in the keybindings capplet when in non-UTF-8 locale
- Fix Esc/Backspace being bindable when CapsLock is on (#427123)


gnome-control-center-2.22.0-caps-lock-bindables.patch:

--- NEW FILE gnome-control-center-2.22.0-caps-lock-bindables.patch ---
Index: capplets/keybindings/eggcellrendererkeys.c
===================================================================
--- capplets/keybindings/eggcellrendererkeys.c	(revision 8602)
+++ capplets/keybindings/eggcellrendererkeys.c	(working copy)
@@ -421,7 +421,8 @@
 
   egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (),
                                         EGG_VIRTUAL_NUM_LOCK_MASK |
-                                        EGG_VIRTUAL_SCROLL_LOCK_MASK,
+                                        EGG_VIRTUAL_SCROLL_LOCK_MASK |
+                                        EGG_VIRTUAL_LOCK_MASK,
                                         &ignored_modifiers);
   
   /* http://bugzilla.gnome.org/show_bug.cgi?id=139605

gnome-control-center-2.22.0-keybinding-xml-encoding.patch:

--- NEW FILE gnome-control-center-2.22.0-keybinding-xml-encoding.patch ---
Index: capplets/keybindings/gnome-keybinding-properties.c
===================================================================
--- capplets/keybindings/gnome-keybinding-properties.c	(revision 8611)
+++ capplets/keybindings/gnome-keybinding-properties.c	(working copy)
@@ -711,6 +711,7 @@
   keys = (KeyListEntry *) g_array_free (keylist->entries, FALSE);
   if (keylist->package)
     {
+      bind_textdomain_codeset (keylist->package, "UTF-8");
       title = dgettext (keylist->package, keylist->name);
     } else {
       title = _(keylist->name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- control-center.spec	20 Mar 2008 05:34:47 -0000	1.348
+++ control-center.spec	31 Mar 2008 12:33:25 -0000	1.349
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -35,6 +35,10 @@
 # Fix some useless warnings in libslab
 # http://bugzilla.gnome.org/show_bug.cgi?id=439398
 Patch6: gnome-control-center-2.19.90-no-warnings.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=513988
+Patch7: gnome-control-center-2.22.0-keybinding-xml-encoding.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=524813
+Patch8: gnome-control-center-2.22.0-caps-lock-bindables.patch
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.21.92-passwd.patch
@@ -163,6 +167,8 @@
 pushd libslab
 %patch6 -p0 -b .warnings
 popd
+%patch7 -p0 -b .keybindings-encoding
+%patch8 -p0 -b .esc-backspace-bindables
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -347,6 +353,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Mar 31 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-3
+- Fix warnings in the keybindings capplet when in non-UTF-8 locale
+- Fix Esc/Backspace being bindable when CapsLock is on (#427123)
+
 * Thu Mar 20 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.0-2
 - Update randr