rpms/kdelibs/F-8 kdelibs-3.5.8-new-flash.patch, 1.1, 1.2 kdelibs.spec, 1.243, 1.244

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6165/F-8

Modified Files:
	kdelibs-3.5.8-new-flash.patch kdelibs.spec 
Log Message:
- update flash patch (#410651)


kdelibs-3.5.8-new-flash.patch:

Index: kdelibs-3.5.8-new-flash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-8/kdelibs-3.5.8-new-flash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.8-new-flash.patch	14 Dec 2007 17:56:17 -0000	1.1
+++ kdelibs-3.5.8-new-flash.patch	21 Dec 2007 13:36:41 -0000	1.2
@@ -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();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- kdelibs.spec	14 Dec 2007 17:56:17 -0000	1.243
+++ kdelibs.spec	21 Dec 2007 13:36:41 -0000	1.244
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.8
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -515,6 +515,9 @@
 
 
 %changelog
+* Fri Dec 21 2007 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.8-20
+- updated Flash patch
+
 * Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-19
 - flash fix (#410651, kde#132138, kde#146784)
 - simplify crystalsvg-icon-theme handling