[gtk3/f16] Fix handling of virtual modifiers

[Matthias Clasen]

commit 922baea0084f35ca9345a9b0c57d37b2d05e14a0
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Dec 8 08:19:42 2011 -0500

    Fix handling of virtual modifiers

 gtk3-super.patch |   11 +++++++++++
 gtk3.spec        |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/gtk3-super.patch b/gtk3-super.patch
new file mode 100644
index 0000000..227371b
--- /dev/null
+++ b/gtk3-super.patch
@@ -0,0 +1,11 @@
+diff -up gtk+-3.2.2/gtk/gtkcellrendereraccel.c.super gtk+-3.2.2/gtk/gtkcellrendereraccel.c
+--- gtk+-3.2.2/gtk/gtkcellrendereraccel.c.super	2011-12-08 08:18:13.691680404 -0500
++++ gtk+-3.2.2/gtk/gtkcellrendereraccel.c	2011-12-08 08:18:22.425680536 -0500
+@@ -472,7 +472,6 @@ grab_key_callback (GtkWidget
+                                        NULL, NULL, NULL, &consumed_modifiers);
+ 
+   accel_mods = event->state;
+-  gdk_keymap_add_virtual_modifiers (gdk_keymap_get_for_display (display), &accel_mods);
+ 
+   accel_key = gdk_keyval_to_lower (event->keyval);
+   if (accel_key == GDK_KEY_ISO_Left_Tab) 
diff --git a/gtk3.spec b/gtk3.spec
index 460238d..65aa8b3 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -9,7 +9,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
 Version: 3.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -18,6 +18,7 @@ Source: http://download.gnome.org/sources/gtk+/3.2/gtk+-%{version}.tar.xz
 Source1: im-cedilla.conf
 
 Patch0: 0001-XI2-Push-error-traps-around-XIQueryDevice-calls.patch
+Patch1: gtk3-super.patch
 
 BuildRequires: gnome-common autoconf automake intltool gettext
 BuildRequires: atk-devel >= %{atk_version}
@@ -112,6 +113,7 @@ widget toolkit.
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -236,6 +238,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Dec  8 2011 Matthias Clasen <mclasen at redhat.com> - 3.2.2-3
+- Fix handling of virtual modifiers when editing accelerators
+
 * Wed Nov 30 2011 Matthias Clasen <mclasen at redhat.com> - 3.2.2-2
 - Try to fix XI2 related crashes