rpms
/
kdelibs3
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync from F8: 

Fri Dec 21 2007 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.8-21
- updated Flash patch
This commit is contained in:
Kevin Kofler 2007-12-22 19:59:10 +00:00
parent c53121b3d5
commit 0d93f5b990
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kdelibs-3.5.8-new-flash.patch
View File

@ -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();

5
kdelibs3.spec
View File

@ -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)