rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-suspend.patch, NONE, 1.1 kdebase-workspace.spec, 1.70, 1.71
Than Ngo (than)
fedora-extras-commits at redhat.com
Fri Apr 18 09:22:18 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11150
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.0.3-suspend.patch
Log Message:
fix #442559, Suspend/Hibernate issue on logout
kdebase-workspace-4.0.3-suspend.patch:
--- NEW FILE kdebase-workspace-4.0.3-suspend.patch ---
diff -up kdebase-workspace-4.0.3/ksmserver/shutdowndlg.cpp.orig kdebase-workspace-4.0.3/ksmserver/shutdowndlg.cpp
--- kdebase-workspace-4.0.3/ksmserver/shutdowndlg.cpp.orig 2008-04-17 23:11:10.000000000 +0200
+++ kdebase-workspace-4.0.3/ksmserver/shutdowndlg.cpp 2008-04-18 00:26:47.000000000 +0200
@@ -57,6 +57,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include "shutdowndlg.moc"
+#include <kjob.h>
+
#define FONTCOLOR "#bfbfbf"
KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L;
@@ -567,7 +569,9 @@ void KSMShutdownDlg::slotSuspend(QAction
{
m_bootOption.clear();
Solid::Control::PowerManager::SuspendMethod spdMethod = action->data().value<Solid::Control::PowerManager::SuspendMethod>();
- Solid::Control::PowerManager::suspend( spdMethod );
+ KJob *job = Solid::Control::PowerManager::suspend( spdMethod );
+ if (job != 0)
+ job->start();
reject();
}
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdebase-workspace.spec 15 Apr 2008 16:52:50 -0000 1.70
+++ kdebase-workspace.spec 18 Apr 2008 09:21:42 -0000 1.71
@@ -6,7 +6,7 @@
Name: kdebase-workspace
Version: 4.0.3
-Release: 15%{?dist}
+Release: 16%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -23,6 +23,7 @@
Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
#Â 441062: packagekit tools do not show icons correctly on KDE
Patch8: kdebase-workspace-4.0.3-krdb.patch
+Patch9: kdebase-workspace-4.0.3-suspend.patch
# http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
@@ -130,6 +131,7 @@
%patch6 -p0 -b .rootprivs
%patch7 -p0 -b .timedate-kcm
%patch8 -p0 -b .krdb
+%patch9 -p1 -b .suspend
# upstream patches
%patch101 -p1 -b .menu-switch
@@ -253,6 +255,9 @@
%changelog
+* Fri Apr 18 2008 Than Ngo <than at redhat.com> 4.0.3-16
+- fix #442559, Suspend/Hibernate issue on logout
+
* Tue Apr 15 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.3-15
- workaround #434824: KDE4 System Settings - No Method To Enter Administrative Mode
- fix #441062: packagekit tools do not show icons correctly on KDE
More information about the fedora-extras-commits
mailing list