diff --git a/and-no-wrong-keybindings-either.patch b/and-no-wrong-keybindings-either.patch new file mode 100644 index 0000000..8b8bf66 --- /dev/null +++ b/and-no-wrong-keybindings-either.patch @@ -0,0 +1,12 @@ +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); diff --git a/control-center.spec b/control-center.spec index 306eab3..52f9757 100644 --- a/control-center.spec +++ b/control-center.spec @@ -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 @@ -229,6 +231,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 @@ -419,6 +422,9 @@ fi %changelog +* Thu Dec 10 2009 Matthias Clasen 2.28.1-11 +- More wm keybinding fixes + * Tue Dec 8 2009 Matthias Clasen 2.28.1-10 - Avoid duplicate entries in the keybinding preferences (#542401)