rpms/kdeutils/devel kdeutils-3.5.4-kde#129161.patch, NONE, 1.1 kdeutils.spec, 1.76, 1.77

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Sep 27 13:35:15 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10303

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.4-kde#129161.patch 
Log Message:
fix #129161, kwalletmanager does not show up in systray


kdeutils-3.5.4-kde#129161.patch:
 kwalletmanager.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdeutils-3.5.4-kde#129161.patch ---
Index: kwallet/kwalletmanager.cpp
===================================================================
--- kwallet/kwalletmanager.cpp	(Revision 578463)
+++ kwallet/kwalletmanager.cpp	(Revision 578464)
@@ -43,6 +43,7 @@
 #include <qguardedptr.h>
 #include <qptrstack.h>
 #include <qregexp.h>
+#include <qtimer.h>
 #include <qtooltip.h>
 
 KWalletManager::KWalletManager(QWidget *parent, const char *name, WFlags f)
@@ -75,7 +76,7 @@
 		if (!isOpen && kapp->isRestored()) {
 			delete _tray;
 			_tray = 0L;
-			kapp->exit();
+			QTimer::singleShot( 0, kapp, SLOT( quit()));
 			return;
 		}
 	} else {


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdeutils.spec	25 Sep 2006 16:31:12 -0000	1.76
+++ kdeutils.spec	27 Sep 2006 13:35:12 -0000	1.77
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
@@ -34,6 +34,7 @@
 Patch101: kdeutils-3.5.4-kde#132420.patch
 Patch102: kdeutils-3.5.4-kde#128925.patch
 Patch103: kdeutils-3.5.4-kde#134192.patch
+Patch104: kdeutils-3.5.4-kde#129161.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -101,6 +102,7 @@
 %patch101 -p0 -b .kde#132420
 %patch102 -p0 -b .kde#128925
 %patch103 -p0 -b .kde#134192
+%patch104 -p0 -b .kde#129161
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -215,6 +217,10 @@
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Wed Sep 27 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
+- apply upstream patches
+    fix #129161, kwalletmanager does not show up in systray
+
 * Mon Sep 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #207920, klaptop_acpi_help to use pm-utils and pam
 - fix crash in klaptopdaemon




More information about the fedora-cvs-commits mailing list