From 54f24a01b8c37d2e6ebcda305ba0daa257b69250 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 7 Sep 2007 20:14:10 +0000
Subject: [PATCH] Add a workaround for the flash backend

---
 gtk2.spec        |  9 ++++++++-
 workaround.patch | 12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 workaround.patch

diff --git a/gtk2.spec b/gtk2.spec
index 4708de9..321c58c 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -37,6 +37,9 @@ Patch4: silence-icon-cache-validator.patch
 Patch5: systray-tooltips.patch
 # fixed in upstream svn
 Patch6: tooltip-compat.patch
+# a workaround for some brokenness in the flash plugin
+# see http://bugzilla.gnome.org/show_bug.cgi?id=463773
+Patch7: workaround.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -127,6 +130,7 @@ docs for the GTK+ widget toolkit.
 %patch4 -p1 -b .silence
 %patch5 -p1 -b .tooltips
 %patch6 -p1 -b .tooltip-compat
+%patch7 -p1 -b .workaround
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -310,7 +314,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Aug 27 2007 Jens Petersen <petersen@redhat.com> - 2.11.6-8
+* Fri Sep  7 2007 Matthias Clasen <mclasen@redhat.com> - 2.11.6-9
+- Add a workaround for the flash plugin
+
+* Fri Sep  7 2007 Ray Strode <rstrode@redhat.com> - 2.11.6-8
 - install dummy binary in libdir/gtk-2.0/immodules directory to
   aid rpm when doing ia64 multilib (bug 253726)
 
diff --git a/workaround.patch b/workaround.patch
new file mode 100644
index 0000000..7beccc3
--- /dev/null
+++ b/workaround.patch
@@ -0,0 +1,12 @@
+Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
+===================================================================
+--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
+@@ -287,6 +287,7 @@
+ gtk_clipboard_get_for_display (GdkDisplay *display, 
+ 			       GdkAtom     selection)
+ {
++  g_return_val_if_fail (display != NULL, NULL);
+   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+   g_return_val_if_fail (!display->closed, NULL);
+