systemtray.patch

diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h
index a58fafa..fdabee6 100644
--- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h
+++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h
@@ -45,6 +45,7 @@ protected:
 
 private slots:
     void ensureValidSize();
+    void directRepaint();
 
 private:
     static QPixmap toX11Pixmap(const QPixmap& pix);
diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp
index 1826512..12cccc0 100644
--- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp
+++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp
@@ -27,6 +27,7 @@
 #include <KDebug>
 
 // Qt
+#include <QtCore/QTimer>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEngine>
 #include <QtGui/QX11Info>
@@ -51,7 +52,8 @@ public:
     Private(X11EmbedContainer *q)
         : q(q),
           picture(None),
-          updatesEnabled(true)
+          updatesEnabled(true),
+          blockDirectPaint(false)
     {
     }
 
@@ -68,6 +70,7 @@ public:
     Picture picture;
     bool updatesEnabled;
     QImage oldBackgroundImage;
+    bool blockDirectPaint;
 };
 
 
@@ -192,6 +197,15 @@ void X11EmbedContainer::paintEvent(QPaintEvent *event)
         return;
     }
 
+    // Qt's backing store code doesn't expect an inferior window having a different visual
+    // than the toplevel and wouldn't paint anything for it. Therefore a direct paint may be needed.
+    // QWidget::render() will give exactly the contents to paint, but it can't be called in paintEvent(),
+    // so instead delay and do not bother painting right now (since the stuff below is inefficient).
+    if(x11Info().visual() != window()->x11Info().visual() && !d->blockDirectPaint) {
+        QTimer::singleShot(0, this, SLOT(directRepaint()));
+        return;
+    }
+
     // Taking a detour via a QPixmap is unfortunately the only way we can get
     // the window contents into Qt's backing store.
     QPixmap pixmap(size());
@@ -246,6 +260,16 @@ QPixmap X11EmbedContainer::toX11Pixmap(const QPixmap& pix)
     return ret;
 }
 
+void X11EmbedContainer::directRepaint()
+{
+    QPixmap pix(size());
+    d->blockDirectPaint = true;
+    render( &pix );
+    d->blockDirectPaint = false;
+    XRenderComposite(x11Info().display(), PictOpSrc, pix.x11PictureHandle(), None, x11PictureHandle(),
+        0, 0, 0, 0, 0, 0, width(), height());
+}
+
 }
 
 #include "x11embedcontainer.moc"