SessionManager: add ScreenSaver{Activate,Deactivate} and relevant signals and export them

Update LockScreenController and dbus apis to match this (bzr r3736.1.41)

2 files changed, 12 insertions, 0 deletions

diff --git a/shutdown/SessionDBusManager.cpp b/shutdown/SessionDBusManager.cpp
index c3ab07070..b1345f8c2 100644
--- a/shutdown/SessionDBusManager.cpp
+++ b/shutdown/SessionDBusManager.cpp
@@ -42,6 +42,8 @@ R"(<node>
 </method>
 <method name="Lock" />
 <method name="PromptLock" />
+ <method name="ActivateScreenSaver" />
+ <method name="DeactivateScreenSaver" />
 <method name="Logout" />
 <method name="RequestLogout" />
 <method name="Reboot" />
@@ -105,6 +107,14 @@ DBusManager::DBusManager(session::Manager::Ptr const& session)
 {
 session_->PromptLockScreen();
 }
+ else if (method == "ActivateScreenSaver")
+ {
+ session_->ScreenSaverActivate();
+ }
+ else if (method == "DeactivateScreenSaver")
+ {
+ session_->ScreenSaverDeactivate();
+ }
 else if (method == "Logout")
 {
 session_->Logout();
diff --git a/shutdown/StandaloneSession.cpp b/shutdown/StandaloneSession.cpp
index f8f1a713d..e12e3d45d 100644
--- a/shutdown/StandaloneSession.cpp
+++ b/shutdown/StandaloneSession.cpp
@@ -40,6 +40,8 @@ public:
 std::string UserName() const { return "marco"; }
 std::string HostName() const { return "tricky"; }
 
+ void ScreenSaverActivate() { std::cout << "ScreenSaverActivate" << std::endl; }
+ void ScreenSaverDeactivate() { std::cout << "ScreenSaverDeactivate" << std::endl; }
 void LockScreen() { std::cout << "LockScreen" << std::endl; }
 void PromptLockScreen() { std::cout << "PromptLockScreen" << std::endl; }
 void Logout() { std::cout << "Logout" << std::endl; }