[gtk2/f16] Fix handling of virtual modifiers

[Matthias Clasen]

commit e55df02f96685a715c1573982dcf52e208dea018
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Dec 8 08:14:10 2011 -0500

    Fix handling of virtual modifiers

 gtk2-super.patch |   11 +++++++++++
 gtk2.spec        |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/gtk2-super.patch b/gtk2-super.patch
new file mode 100644
index 0000000..f7f4d9e
--- /dev/null
+++ b/gtk2-super.patch
@@ -0,0 +1,11 @@
+diff -up gtk+-2.24.8/gtk/gtkcellrendereraccel.c.super gtk+-2.24.8/gtk/gtkcellrendereraccel.c
+--- gtk+-2.24.8/gtk/gtkcellrendereraccel.c.super	2011-12-08 08:11:49.933674643 -0500
++++ gtk+-2.24.8/gtk/gtkcellrendereraccel.c	2011-12-08 08:11:58.640674768 -0500
+@@ -428,7 +428,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_ISO_Left_Tab) 
diff --git a/gtk2.spec b/gtk2.spec
index 2c53311..62319c3 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -18,7 +18,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: 2.24.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -41,6 +41,8 @@ Patch8: tooltip-positioning.patch
 Patch15: window-dragging.patch
 # upstream fix
 Patch16: 0001-Revert-iconview-layout-items-immediately-when-settin.patch
+# fix accel cell renderer handling of virtual modifiers
+Patch17: gtk2-super.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -158,6 +160,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
 #%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .window-dragging
 %patch16 -p1
+%patch17 -p1
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -344,6 +347,9 @@ fi
 %doc tmpdocs/examples
 
 %changelog
+* Thu Dec  8 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.8-3
+- Fix handling of virtual modifiers when editing accelerators
+
 * Wed Nov 23 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.8-2
 - Update to 2.24.8