rpms/kdebase-workspace/devel kdebase-workspace-4.0.85-kde#164786.patch, NONE, 1.1 kdebase-workspace.spec, 1.93, 1.94

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.85-kde#164786.patch 
Log Message:
* Wed Jul 09 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-2
- systray icon patch (kde#164786)


kdebase-workspace-4.0.85-kde#164786.patch:

--- NEW FILE kdebase-workspace-4.0.85-kde#164786.patch ---
Index: systemtraycontainer.cpp
===================================================================
--- systemtraycontainer.cpp	(revision 829753)
+++ systemtraycontainer.cpp	(working copy)
@@ -67,6 +67,15 @@
     }
 }
 
+bool SystemTrayContainer::x11Event(XEvent *event)
+{
+    bool ok = QX11EmbedContainer::x11Event(event);
+    if (event->type == ReparentNotify) {
+        setMinimumSize(22,22);
+    }
+    return ok;
+}
+
 void SystemTrayContainer::updateBackground()
 {
     // Qt's regular quasi-transparent background doesn't work so set it to the
Index: systemtraycontainer.h
===================================================================
--- systemtraycontainer.h	(revision 829753)
+++ systemtraycontainer.h	(working copy)
@@ -33,6 +33,9 @@
     explicit SystemTrayContainer(QWidget *parent);
     void embedSystemTrayClient( WId clientId );
 
+protected:
+    bool x11Event(XEvent *event);
+
 private:
     bool prepareFor( WId id );
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kdebase-workspace.spec	7 Jul 2008 12:48:07 -0000	1.93
+++ kdebase-workspace.spec	9 Jul 2008 20:03:24 -0000	1.94
@@ -2,7 +2,7 @@
 Name: kdebase-workspace
 Version: 4.0.85
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -36,6 +36,8 @@
 Patch203: kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch
 Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
+# (gtk) systray icons
+Patch205: kdebase-workspace-4.0.85-kde#164786.patch
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
@@ -152,6 +154,9 @@
 # no longer needed (?)
 #patch201 -p1 -b .kde#154119
 %patch204 -p1 -b .kickoff-suspend
+pushd plasma/applets/systemtray/
+%patch205 -p0 -b .kde#164786
+popd
 
 
 %build
@@ -284,6 +289,9 @@
 
 
 %changelog
+* Wed Jul 09 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-2
+- systray icon patch (kde#164786)
+
 * Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
 - 4.0.85