From 0d93f5b9901a3af6f82f433cb248329b972da9df Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Sat, 22 Dec 2007 19:59:10 +0000
Subject: [PATCH] =?UTF-8?q?Sync=20from=20F8:=20Fri=20Dec=2021=202007=20Luk?=
 =?UTF-8?q?=C3=A1=C5=A1=20Tinkl=20<ltinkl@redhat.com>=20-=203.5.8-21=20-?=
 =?UTF-8?q?=20updated=20Flash=20patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kdelibs-3.5.8-new-flash.patch | 15 ++++++++-------
 kdelibs3.spec                 |  5 ++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kdelibs-3.5.8-new-flash.patch b/kdelibs-3.5.8-new-flash.patch
index 0011c4d..29094f3 100644
--- a/kdelibs-3.5.8-new-flash.patch
+++ b/kdelibs-3.5.8-new-flash.patch
@@ -1,5 +1,5 @@
---- kdeui/qxembed.cpp.sav	2007-10-05 15:24:40.000000000 +0200
-+++ kdeui/qxembed.cpp	2007-12-12 15:16:00.000000000 +0100
+--- kdeui/qxembed.cpp.sav	2007-12-19 18:46:54.000000000 +0100
++++ kdeui/qxembed.cpp	2007-12-19 18:48:07.000000000 +0100
 @@ -1013,6 +1013,44 @@ void QXEmbed::embed(WId w)
      }
  }
@@ -45,13 +45,14 @@
  
  // L1800: Returns the window identifier of the embedded window
  WId QXEmbed::embeddedWinId() const
-@@ -1051,6 +1089,13 @@ bool QXEmbed::x11Event( XEvent* e)
+@@ -1051,6 +1089,14 @@ bool QXEmbed::x11Event( XEvent* e)
              emit embeddedWindowDestroyed();
          }
          break;
 +    case CreateNotify:
 +        // A window was created inside of QXEmbed, handle it as embedded
-+        if( window == 0 ) { // only one window
++        if( true || // flashplayer v9,0,115,0 bug
++            window == 0 ) { // only one window
 +            window = e->xcreatewindow.window;
 +            handleEmbed();
 +        }
@@ -59,7 +60,7 @@
      case ReparentNotify:
          if ( e->xreparent.window == d->focusProxy->winId() )
              break; // ignore proxy
-@@ -1067,40 +1112,8 @@ bool QXEmbed::x11Event( XEvent* e)
+@@ -1067,40 +1113,8 @@ bool QXEmbed::x11Event( XEvent* e)
                  XRemoveFromSaveSet( qt_xdisplay(), window );
          } else if ( e->xreparent.parent == winId()){
              // L2020: We got a window. Complete the embedding process.
@@ -102,8 +103,8 @@
          }
          break;
      case ButtonPress:
---- kdeui/qxembed.h.sav	2005-09-29 21:32:29.000000000 +0200
-+++ kdeui/qxembed.h	2001-01-01 01:01:00.000000000 +0100
+--- kdeui/qxembed.h.sav	2007-12-19 18:46:54.000000000 +0100
++++ kdeui/qxembed.h	2007-12-19 18:47:00.000000000 +0100
 @@ -226,6 +226,7 @@ private:
      QXEmbedData* d;
      void checkGrab();
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 78352db..161613b 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.8
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -518,6 +518,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Fri Dec 21 2007 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.8-21
+- updated Flash patch
+
 * Mon Dec 17 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.8-20
 - Requires: kdelibs-common (F9+) (#417251)