[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/kworkspace
From:       Kevin Kofler <kevin.kofler () chello ! at>
Date:       2010-10-27 16:01:17
Message-ID: 20101027160117.ABC6EAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190424 by kkofler:

KDisplayManager: support for shutdown/restart with no DM through ConsoleKit
Approved by ossi: http://svn.reviewboard.kde.org/r/5699/
CCMAIL: ossi@kde.org

 M  +2 -2      kdisplaymanager.cpp  


--- trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp #1190423:1190424
@@ -283,7 +283,7 @@
 bool
 KDisplayManager::canShutdown()
 {
-    if (DMType == NewGDM) {
+    if (DMType == NewGDM || DMType == NoDM) {
         QDBusReply<bool> canStop = CKManager().call(QLatin1String("CanStop"));
         return (canStop.isValid() && canStop.value());
     }
@@ -315,7 +315,7 @@
         if (!bootOption.isEmpty())
             return;
 
-        if (DMType == NewGDM) {
+        if (DMType == NewGDM || DMType == NoDM) {
             // FIXME: entirely ignoring shutdownMode
             CKManager().call(QLatin1String(
                     shutdownType == KWorkSpace::ShutdownTypeReboot ? "Restart" : "Stop"));
[prev in list] [next in list] [prev in thread] [next in thread]