summaryrefslogtreecommitdiff
path: root/shutdown
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-05-16 06:24:26 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-05-16 06:24:26 +0200
commit59489bc1de6b661fc08822f5e020e2555d8702c6 (patch)
tree40ed651565ad551833750477c8841a27e1700568 /shutdown
parent8556af7394ec0d83fb98d394b52c5f5f71e6e22f (diff)
SessionDBusManager: set the inhibited bits based on the current system status
(bzr r3806.11.8)
Diffstat (limited to 'shutdown')
-rw-r--r--shutdown/SessionDBusManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/shutdown/SessionDBusManager.cpp b/shutdown/SessionDBusManager.cpp
index 82fa1f9b3..b9035a444 100644
--- a/shutdown/SessionDBusManager.cpp
+++ b/shutdown/SessionDBusManager.cpp
@@ -127,7 +127,7 @@ DBusManager::DBusManager(session::Manager::Ptr const& session)
}
else if (method == "RequestLogout")
{
- session_->logout_requested.emit(false);
+ session_->logout_requested.emit(session_->HasInhibitors());
}
else if (method == "Reboot")
{
@@ -135,7 +135,7 @@ DBusManager::DBusManager(session::Manager::Ptr const& session)
}
else if (method == "RequestReboot")
{
- session_->reboot_requested.emit(false);
+ session_->reboot_requested.emit(session_->HasInhibitors());
}
else if (method == "Shutdown")
{
@@ -143,7 +143,7 @@ DBusManager::DBusManager(session::Manager::Ptr const& session)
}
else if (method == "RequestShutdown")
{
- session_->shutdown_requested.emit(false);
+ session_->shutdown_requested.emit(session_->HasInhibitors());
}
else if (method == "Suspend")
{