rpms/control-center/F-12 and-no-wrong-keybindings-either.patch, NONE, 1.1 control-center.spec, 1.510, 1.511

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	control-center.spec 
Added Files:
	and-no-wrong-keybindings-either.patch 
Log Message:
more keybinding fixes


and-no-wrong-keybindings-either.patch:
 gnome-keybinding-properties.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE and-no-wrong-keybindings-either.patch ---
diff -up gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c
--- gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion	2009-12-10 13:03:24.592158905 -0500
+++ gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c	2009-12-10 13:03:33.484378505 -0500
@@ -868,7 +868,7 @@ append_keys_to_tree_from_file (GtkBuilde
   /* If there's no keys to add, or the settings apply to a window manager
    * that's not the one we're running */
   if (keylist->entries->len == 0
-      || (keylist->wm_name != NULL && strv_contains (wm_keybindings, keylist->wm_name))
+      || (keylist->wm_name != NULL && !strv_contains (wm_keybindings, keylist->wm_name))
       || keylist->name == NULL)
     {
       g_free (keylist->name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- control-center.spec	9 Dec 2009 02:45:31 -0000	1.510
+++ control-center.spec	10 Dec 2009 18:13:41 -0000	1.511
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -85,6 +85,8 @@ Patch60: override-redirect.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=604130
 Patch62: no-duplicate-keybindings-dammit.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604295
+Patch63: and-no-wrong-keybindings-either.patch
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
@@ -233,6 +235,7 @@ for the GNOME desktop.
 %patch57 -p1 -b .monitor-aspect
 %patch60 -p1 -b .override-redirect
 %patch62 -p1 -b .no-duplicate-keybindings
+%patch63 -p1 -b .no-wrong-keybindings
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -424,6 +427,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-11
+- More wm keybinding fixes
+
 * Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
 - Avoid duplicate entries in the keybinding preferences (#542401)