rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-powerdevil.patch, NONE, 1.1 kdebase-workspace.spec, 1.206, 1.207
Than Ngo
than at fedoraproject.org
Mon Mar 23 15:23:59 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26127
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.2.1-powerdevil.patch
Log Message:
upstream patch to fix suspending issue
kdebase-workspace-4.2.1-powerdevil.patch:
--- NEW FILE kdebase-workspace-4.2.1-powerdevil.patch ---
Index: workspace/ksmserver/KSMServerInterface.h
===================================================================
--- workspace/ksmserver/KSMServerInterface.h (Revision 942654)
+++ workspace/ksmserver/KSMServerInterface.h (Revision 942655)
@@ -43,9 +43,6 @@
Q_SCRIPTABLE void resumeStartup( QString );
Q_SCRIPTABLE void wmChanged();
-Q_SIGNALS:
- Q_SCRIPTABLE void loggingOut( int, int, int );
-
};
#endif
Index: workspace/ksmserver/org.kde.KSMServerInterface.xml
===================================================================
--- workspace/ksmserver/org.kde.KSMServerInterface.xml (Revision 942654)
+++ workspace/ksmserver/org.kde.KSMServerInterface.xml (Revision 942655)
@@ -27,11 +27,5 @@
<arg type="s" direction="in"/>
</method>
<method name="wmChanged"/>
-
- <signal name="loggingOut">
- <arg type="i" direction="out"/>
- <arg type="i" direction="out"/>
- <arg type="i" direction="out"/>
- </signal>
</interface>
</node>
Index: workspace/ksmserver/server.h
===================================================================
--- workspace/ksmserver/server.h (Revision 942654)
+++ workspace/ksmserver/server.h (Revision 942655)
@@ -194,9 +194,6 @@
QStringList sessionList();
void wmChanged();
- Q_SIGNALS:
- void loggingOut( int, int, int );
-
private:
QList<KSMListener*> listener;
QList<KSMClient*> clients;
@@ -252,6 +249,8 @@
OrgKdeKLauncherInterface* klauncherSignals;
QDBusInterface* kcminitSignals;
+
+ int inhibitCookie;
};
#endif
Index: workspace/ksmserver/shutdown.cpp
===================================================================
--- workspace/ksmserver/shutdown.cpp (Revision 942654)
+++ workspace/ksmserver/shutdown.cpp (Revision 942655)
@@ -72,6 +72,7 @@
#include "client.h"
#include "shutdowndlg.h"
+#include <solid/powermanagement.h>
#include <kdebug.h>
@@ -82,8 +83,6 @@
void KSMServer::logout( int confirm, int sdtype, int sdmode )
{
- emit loggingOut( confirm, sdtype, sdmode );
-
shutdown( (KWorkSpace::ShutdownConfirm)confirm,
(KWorkSpace::ShutdownType)sdtype,
(KWorkSpace::ShutdownMode)sdmode );
@@ -158,6 +157,10 @@
if ( logoutConfirmed ) {
+ // If the logout was confirmed, let's start a powermanagement inhibition.
+ // We store the cookie so we can interrupt it if the logout will be canceled
+ inhibitCookie = Solid::PowerManagement::beginSuppressingSleep();
+
shutdownType = sdtype;
shutdownMode = sdmode;
bootOption = bopt;
@@ -357,6 +360,7 @@
void KSMServer::cancelShutdown( KSMClient* c )
{
+ Solid::PowerManagement::stopSuppressingSleep(inhibitCookie);
kDebug( 1218 ) << "Client " << c->program() << " (" << c->clientId() << ") canceled shutdown.";
KNotification::event( "cancellogout" , i18n( "Logout canceled by '%1'", c->program()),
QPixmap() , 0l , KNotification::DefaultEvent );
Index: workspace/powerdevil/daemon/PowerDevilDaemon.cpp
===================================================================
--- workspace/powerdevil/daemon/PowerDevilDaemon.cpp (Revision 942654)
+++ workspace/powerdevil/daemon/PowerDevilDaemon.cpp (Revision 942655)
@@ -188,7 +188,6 @@
const char*, const QString&)),
SLOT(emitCriticalNotification(const QString&, const QString&,
const char*, const QString&)));
- connect(d->ksmServerIface, SIGNAL(loggingOut(int,int,int)), this, SLOT(loggingOut(int,int,int)));
/* Time for setting up polling! We can have different methods, so
* let's check what we got.
@@ -233,11 +232,6 @@
kDebug() << KGlobal::locale()->formatDuration(time);
}
-void PowerDevilDaemon::loggingOut(int confirm, int sdtype, int sdmode)
-{
- d->lockHandler->inhibit("","");
-}
-
SuspensionLockHandler *PowerDevilDaemon::lockHandler()
{
return d->lockHandler;
Index: workspace/powerdevil/daemon/PowerDevilDaemon.h
===================================================================
--- workspace/powerdevil/daemon/PowerDevilDaemon.h (Revision 942654)
+++ workspace/powerdevil/daemon/PowerDevilDaemon.h (Revision 942655)
@@ -117,8 +117,6 @@
void batteryRemainingTimeChanged(int time);
- void loggingOut(int confirm, int sdtype, int sdmode);
-
Q_SIGNALS:
void lidClosed(int code, const QString &action);
void errorTriggered(const QString &error);
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- kdebase-workspace.spec 23 Mar 2009 15:00:28 -0000 1.206
+++ kdebase-workspace.spec 23 Mar 2009 15:23:29 -0000 1.207
@@ -8,7 +8,7 @@
Name: kdebase-workspace
Version: 4.2.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -50,6 +50,8 @@
Patch106: kdebase-workspace-4.2.1-kde#185585.patch
# 4.2, http://bugs.kde.org/186992
Patch107: kdebase-workspace-4.2.1-hotkey.patch
+# 4.2, http://bugs.kde.org/183273
+Patch108: kdebase-workspace-4.2.1-powerdevil.patch
# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
%if 0%{?fedora} == 9
@@ -250,6 +252,7 @@
%patch105 -p0 -b .desktopnumbers
%patch106 -p0 -b .kde#185585
%patch107 -p1 -b .kde#186992
+%patch108 -p1 -b .kde#183273
%build
@@ -513,6 +516,9 @@
%changelog
+* Mon Mar 23 2009 Than Ngo <than at redhat.com> - 4.2.1-12
+- upstream patch to fix suspending issue
+
* Mon Mar 23 2009 REx Dieter <rdieter at fedoraproject.org> - 4.2.1-11
- Obsoletes: guidance-power-manager (-> powerdevil upgrade path, F-11+)
More information about the scm-commits
mailing list