rpms/kdebase-workspace/devel kdebase-workspace-4.0.0-systemtray.patch, 1.1, 1.2 kdebase-workspace.spec, 1.22, 1.23

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase-workspace-4.0.0-systemtray.patch 
	kdebase-workspace.spec 
Log Message:
rework systemtray patch, try again


kdebase-workspace-4.0.0-systemtray.patch:

Index: kdebase-workspace-4.0.0-systemtray.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.0-systemtray.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.0-systemtray.patch	9 Jan 2008 13:20:18 -0000	1.1
+++ kdebase-workspace-4.0.0-systemtray.patch	9 Jan 2008 14:15:05 -0000	1.2
@@ -1,6 +1,58 @@
-diff -uNr systemtray-4.0.0/systemtraycontainer.cpp systemtray-4.0.1/systemtraycontainer.cpp
---- systemtray-4.0.0/systemtraycontainer.cpp	2008-01-09 21:55:21.000000000 +0900
-+++ systemtray-4.0.1/systemtraycontainer.cpp	2008-01-09 21:55:44.000000000 +0900
+diff -up kdebase-workspace-4.0.0/libs/plasma/theme.h.systemtray kdebase-workspace-4.0.0/libs/plasma/theme.h
+--- kdebase-workspace-4.0.0/libs/plasma/theme.h.systemtray	2008-01-04 17:55:34.000000000 -0600
++++ kdebase-workspace-4.0.0/libs/plasma/theme.h	2008-01-09 08:12:07.000000000 -0600
+@@ -104,6 +104,11 @@ class PLASMA_EXPORT Theme : public QObje
+         Q_INVOKABLE QColor textColor() const;
+ 
+         /**
++         * Returns the background color to be used by items resting on the background
++         */
++        Q_INVOKABLE QColor backgroundColor() const;
++
++        /**
+          * Sets the default font to be used with themed items. Defaults to
+          * the application wide default font.
+          */
+diff -up kdebase-workspace-4.0.0/libs/plasma/theme.cpp.systemtray kdebase-workspace-4.0.0/libs/plasma/theme.cpp
+--- kdebase-workspace-4.0.0/libs/plasma/theme.cpp.systemtray	2008-01-04 17:55:34.000000000 -0600
++++ kdebase-workspace-4.0.0/libs/plasma/theme.cpp	2008-01-09 08:12:07.000000000 -0600
+@@ -167,6 +167,12 @@ QColor Theme::textColor() const
+     return colors.foreground(KColorScheme::NormalText).color();
+ }
+ 
++QColor Theme::backgroundColor() const
++{
++    KColorScheme colors(QPalette::Active, KColorScheme::Window, Theme::self()->colors());
++    return colors.background().color();
++}
++
+ void Theme::setFont(const QFont &font)
+ {
+     d->generalFont = font;
+diff -up kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.h.systemtray kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.h
+--- kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.h.systemtray	2008-01-04 17:55:49.000000000 -0600
++++ kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.h	2008-01-09 08:12:07.000000000 -0600
+@@ -25,7 +25,16 @@
+ // Qt
+ #include <QX11EmbedContainer>
+ 
+-class SystemTrayContainer: public QX11EmbedContainer
++class KX11EmbedContainer : public QX11EmbedContainer
++{
++Q_OBJECT
++public:
++    KX11EmbedContainer( QWidget* parent = NULL )
++        : QX11EmbedContainer( parent ) {}
++    void prepareFor( WId id );
++};
++
++class SystemTrayContainer: public KX11EmbedContainer
+ {
+ Q_OBJECT
+ 
+diff -up kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.cpp.systemtray kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.cpp
+--- kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.cpp.systemtray	2008-01-04 17:55:49.000000000 -0600
++++ kdebase-workspace-4.0.0/plasma/applets/systemtray/systemtraycontainer.cpp	2008-01-09 08:12:07.000000000 -0600
 @@ -28,22 +28,27 @@
  // Qt
  #include <QX11Info>
@@ -34,7 +86,7 @@
  
      kDebug() << "attempting to embed" << clientId;
      embedClient(clientId);
-@@ -62,3 +67,37 @@
+@@ -62,3 +67,37 @@ void SystemTrayContainer::handleError(QX
      Q_UNUSED(error);
      deleteLater();
  }
@@ -72,24 +124,3 @@
 +                 | SubstructureNotifyMask);
 +    XFlush( dpy );
 +}
-diff -uNr systemtray-4.0.0/systemtraycontainer.h systemtray-4.0.1/systemtraycontainer.h
---- systemtray-4.0.0/systemtraycontainer.h	2008-01-09 21:55:21.000000000 +0900
-+++ systemtray-4.0.1/systemtraycontainer.h	2008-01-09 21:55:44.000000000 +0900
-@@ -25,7 +25,16 @@
- // Qt
- #include <QX11EmbedContainer>
- 
--class SystemTrayContainer: public QX11EmbedContainer
-+class KX11EmbedContainer : public QX11EmbedContainer
-+{
-+Q_OBJECT
-+public:
-+    KX11EmbedContainer( QWidget* parent = NULL )
-+        : QX11EmbedContainer( parent ) {}
-+    void prepareFor( WId id );
-+};
-+
-+class SystemTrayContainer: public KX11EmbedContainer
- {
- Q_OBJECT
- 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kdebase-workspace.spec	9 Jan 2008 13:20:18 -0000	1.22
+++ kdebase-workspace.spec	9 Jan 2008 14:15:05 -0000	1.23
@@ -100,9 +100,7 @@
 # ConsoleKit support for KDM (#228111, kde#147790)
 %patch2 -p1 -b .consolekit
 # 
-pushd plasma/applets/systemtray
 %patch3 -p1 -b .systemtray
-popd
 
 
 %build