rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-systemtray.patch, NONE, 1.1 kdebase-workspace.spec, 1.50, 1.51

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22316

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.2-systemtray.patch 
Log Message:
- apply upstream patch to fix changing wallpaper causes desktop to go white
- apply upstream patch to check whether the to-be-embedded window has been destroyed, (bz#437058)


kdebase-workspace-4.0.2-systemtray.patch:

--- NEW FILE kdebase-workspace-4.0.2-systemtray.patch ---
Index: workspace/plasma/applets/systemtray/systemtraycontainer.cpp
===================================================================
--- workspace/plasma/applets/systemtray/systemtraycontainer.cpp	(Revision 785140)
+++ workspace/plasma/applets/systemtray/systemtraycontainer.cpp	(Revision 785141)
@@ -35,7 +35,10 @@
 SystemTrayContainer::SystemTrayContainer(WId clientId, QWidget *parent)
     : QX11EmbedContainer(parent)
 {
-    prepareFor(clientId); // temporary hack, until QX11EmbedContainer gets fixed
+    if( !prepareFor(clientId)) { // temporary hack, until QX11EmbedContainer gets fixed
+        deleteLater();
+        return;
+    }
 
     connect(this, SIGNAL(clientClosed()), SLOT(deleteLater()));
     connect(this, SIGNAL(error(QX11EmbedContainer::Error)), SLOT(handleError(QX11EmbedContainer::Error)));
@@ -76,12 +79,13 @@
 
 // Temporary hack to change X window used by QX11EmbedContainer so that it matches
 // the window embedded into it (#153193).
-void SystemTrayContainer::prepareFor(WId w)
+bool SystemTrayContainer::prepareFor(WId w)
 {
     Display* dpy = QX11Info::display();
 
     XWindowAttributes ga;
-    XGetWindowAttributes(dpy, w, &ga);
+    if( !XGetWindowAttributes(dpy, w, &ga))
+        return false;
 
     XSetWindowAttributes sa;
     sa.background_pixel = WhitePixel(dpy, DefaultScreen(dpy));
@@ -110,4 +114,5 @@
             StructureNotifyMask |
             SubstructureNotifyMask);
     XFlush(dpy);
+    return true;
 }
Index: workspace/plasma/applets/systemtray/systemtraycontainer.h
===================================================================
--- workspace/plasma/applets/systemtray/systemtraycontainer.h	(Revision 785140)
+++ workspace/plasma/applets/systemtray/systemtraycontainer.h	(Revision 785141)
@@ -33,7 +33,7 @@
     SystemTrayContainer(WId client, QWidget *parent);
 
 private:
-    void prepareFor( WId id );
+    bool prepareFor( WId id );
 
 private slots:
     void handleError(QX11EmbedContainer::Error error);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdebase-workspace.spec	12 Mar 2008 17:01:11 -0000	1.50
+++ kdebase-workspace.spec	13 Mar 2008 12:32:32 -0000	1.51
@@ -23,6 +23,7 @@
 # upstream patch
 Patch101: kdebase-workspace-4.0.x-kcontrol-crash.patch
 Patch102: kdebase-workspace-4.0.2-wallpaper-desktop.patch
+Patch103: kdebase-workspace-4.0.2-systemtray.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -115,6 +116,7 @@
 %patch100 -p1 -b .kde#155362
 %patch101 -p1 -b .kcontrol-crash
 %patch102 -p1 -b .wallpaper-desktop
+%patch103 -p1 -b .systemtray
 
 %build
 
@@ -229,6 +231,7 @@
 %changelog
 * Wed Mar 12 2008 Than Ngo <than at redhat.com> 4.0.2-7
 - apply upstream patch to fix changing wallpaper causes desktop to go white
+- apply upstream patch to check whether the to-be-embedded window has been destroyed, (bz#437058)
 
 * Mon Mar 10 2008 Than Ngo <than at redhat.com> 4.0.2-6
 - add gestures=false in kde-settings, remove kdebase-workspace-4.0.2-Gestures.patch