Merge lp:~3v1n0/unity/lockscreen-prompt-activation into lp:unity

[Marco Trevisan (Treviño)]

LockScreen: add ability to show without fading in on some system calls

Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
Many cleanups and misc fixes.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3778
http://jenkins.qa.ubuntu.com/job/unity-ci/863/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/397

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/863/rebuild

review: Approve (continuous-integration)

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2014-04-10 06:37:15 +0000
+++ UnityCore/GnomeSessionManager.cpp	2014-04-10 06:37:15 +0000
@@ -72,6 +72,9 @@
 {
 const std::string SESSION_OPTIONS = "com.canonical.indicator.session";
 const std::string SUPPRESS_DIALOGS_KEY = "suppress-logout-restart-shutdown";
+
+const std::string GNOME_LOCKDOWN_OPTIONS = "org.gnome.desktop.lockdown";
+const std::string DISABLE_LOCKSCREEN_KEY = "disable-lock-screen";
 }
 
 GnomeManager::Impl::Impl(GnomeManager* manager, bool test_mode)
@@ -96,7 +99,7 @@
                                                      test_mode_ ? G_BUS_TYPE_SESSION : G_BUS_TYPE_SYSTEM);
 
     login_proxy_->Connect("Lock", [this](GVariant*){
-      manager_->LockScreen();
+      manager_->PromptLockScreen();
     });
 
     login_proxy_->Connect("Unlock", [this](GVariant*){
@@ -397,6 +400,28 @@
   });
 }
 
+void GnomeManager::Impl::LockScreen(bool prompt)
+{
+  EnsureCancelPendingAction();
+
+  // FIXME (andy) we should ask gnome-session to emit the logind signal
+  glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
+
+  if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()))
+  {
+    manager_->ScreenSaverActivate();
+    return;
+  }
+  else if (manager_->UserName().find("guest-") == 0)
+  {
+    LOG_INFO(logger) << "Impossible to lock a guest session";
+    manager_->ScreenSaverActivate();
+    return;
+  }
+
+  prompt ? manager_->prompt_lock_requested.emit() : manager_->lock_requested.emit();
+}
+
 // Public implementation
 
 GnomeManager::GnomeManager()
@@ -430,17 +455,24 @@
   return glib::gchar_to_string(g_get_host_name());
 }
 
+void GnomeManager::ScreenSaverActivate()
+{
+  screensaver_requested.emit(true);
+}
+
+void GnomeManager::ScreenSaverDeactivate()
+{
+  screensaver_requested.emit(false);
+}
+
 void GnomeManager::LockScreen()
 {
-  impl_->EnsureCancelPendingAction();
+  impl_->LockScreen(false);
+}
 
-  // FIXME (andy) we should ask gnome-session to emit the logind signal
-  if (UserName().find("guest-") == 0)
-  {
-    LOG_INFO(logger) << "Impossible to lock a guest session";
-    return;
-  }
-  lock_requested.emit();
+void GnomeManager::PromptLockScreen()
+{
+  impl_->LockScreen(true);
 }
 
 void GnomeManager::Logout()
@@ -538,7 +570,7 @@
   impl_->EnsureCancelPendingAction();
   impl_->CallLogindMethod("Suspend", g_variant_new("(b)", FALSE), [this] (GVariant* variant, glib::Error const& err) {
     // fallback to UPower
-    if (err) 
+    if (err)
       impl_->CallUPowerMethod("Suspend");
   });
 }

=== modified file 'UnityCore/GnomeSessionManager.h'
--- UnityCore/GnomeSessionManager.h	2014-03-06 07:15:19 +0000
+++ UnityCore/GnomeSessionManager.h	2014-04-10 06:37:15 +0000
@@ -37,7 +37,10 @@
   std::string UserName() const;
   std::string HostName() const;
 
+  void ScreenSaverActivate();
+  void ScreenSaverDeactivate();
   void LockScreen();
+  void PromptLockScreen();
   void Logout();
   void Reboot();
   void Shutdown();

=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
--- UnityCore/GnomeSessionManagerImpl.h	2014-04-10 06:37:15 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2014-04-10 06:37:15 +0000
@@ -52,6 +52,7 @@
   void CancelAction();
   void ClosedDialog();
   void EnsureCancelPendingAction();
+  void LockScreen(bool prompt);
 
   GVariant* OnShellMethodCall(std::string const& method, GVariant* parameters);
   void CallGnomeSessionMethod(std::string const& method, GVariant* parameters = nullptr,

=== modified file 'UnityCore/SessionManager.h'
--- UnityCore/SessionManager.h	2014-04-10 06:37:15 +0000
+++ UnityCore/SessionManager.h	2014-04-10 06:37:15 +0000
@@ -40,7 +40,10 @@
   virtual std::string UserName() const = 0;
   virtual std::string HostName() const = 0;
 
+  virtual void ScreenSaverActivate() = 0;
+  virtual void ScreenSaverDeactivate() = 0;
   virtual void LockScreen() = 0;
+  virtual void PromptLockScreen() = 0;
   virtual void Logout() = 0;
   virtual void Reboot() = 0;
   virtual void Shutdown() = 0;
@@ -59,12 +62,14 @@
 
   sigc::signal<void> lock_requested;
   sigc::signal<void> unlock_requested;
+  sigc::signal<void> prompt_lock_requested;
   sigc::signal<void> locked;
   sigc::signal<void> unlocked;
   sigc::signal<void, bool /* inhibitors */> logout_requested;
   sigc::signal<void, bool /* inhibitors */> reboot_requested;
   sigc::signal<void, bool /* inhibitors */> shutdown_requested;
   sigc::signal<void, bool /* is_idle */> presence_status_changed;
+  sigc::signal<void, bool /* active */> screensaver_requested;
 
   sigc::signal<void> cancel_requested;
 };

=== modified file 'lockscreen/BackgroundSettings.cpp'
--- lockscreen/BackgroundSettings.cpp	2014-03-07 18:34:03 +0000
+++ lockscreen/BackgroundSettings.cpp	2014-04-10 06:37:15 +0000
@@ -110,7 +110,7 @@
     int width = geo.width;
     int height = geo.height;
     int grid_x_offset = GetGridOffset(width);
-    int grid_y_offset = GetGridOffset(height) + panel::Style().Instance().PanelHeight(monitor);
+    int grid_y_offset = GetGridOffset(height) + panel::Style::Instance().PanelHeight(monitor);
 
     // overlay grid
     cairo_surface_t* overlay_surface = cairo_surface_create_similar(cairo_graphics.GetSurface(),

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-04-10 06:37:15 +0000
+++ lockscreen/LockScreenController.cpp	2014-04-10 06:37:15 +0000
@@ -36,7 +36,15 @@
 {
 const unsigned int IDLE_FADE_DURATION = 10000;
 const unsigned int LOCK_FADE_DURATION = 400;
-const unsigned int POST_LOCK_SCREENSAVER_WAIT = 2000;
+const unsigned int POST_LOCK_SCREENSAVER_WAIT = 2;
+
+class BlankWindow : public nux::BaseWindow
+{
+public:
+  BlankWindow() : nux::BaseWindow("UnityScreensaver") {}
+  bool AcceptKeyNavFocus() override { return true; }
+  bool InspectKeyEvent(unsigned int, unsigned int, const char*) override { return true; };
+};
 }
 
 DECLARE_LOGGER(logger, "unity.lockscreen");
@@ -54,7 +62,7 @@
   , fade_animator_(LOCK_FADE_DURATION)
   , blank_window_animator_(IDLE_FADE_DURATION)
   , test_mode_(test_mode)
-  , skip_animation_(false)
+  , prompt_activation_(false)
 {
   auto* uscreen = UScreen::GetDefault();
   uscreen_connection_ = uscreen->changed.connect([this] (int, std::vector<nux::Geometry> const& monitors) {
@@ -66,12 +74,13 @@
 
   suspend_connection_ = uscreen->suspending.connect([this] {
     if (Settings::Instance().lock_on_suspend())
-      RequestPromptScreenLock();
+      session_manager_->PromptLockScreen();
   });
 
   dbus_manager_->simulate_activity.connect(sigc::mem_fun(this, &Controller::SimulateActivity));
-  dbus_manager_->request_activate.connect(sigc::mem_fun(this, &Controller::OnScreenSaverActivationRequest));
-  session_manager_->lock_requested.connect(sigc::mem_fun(this, &Controller::OnLockRequested));
+  session_manager_->screensaver_requested.connect(sigc::mem_fun(this, &Controller::OnScreenSaverActivationRequest));
+  session_manager_->lock_requested.connect(sigc::bind(sigc::mem_fun(this, &Controller::OnLockRequested), false));
+  session_manager_->prompt_lock_requested.connect(sigc::bind(sigc::mem_fun(this, &Controller::OnLockRequested), true));
   session_manager_->unlock_requested.connect(sigc::mem_fun(this, &Controller::OnUnlockRequested));
   session_manager_->presence_status_changed.connect(sigc::mem_fun(this, &Controller::OnPresenceStatusChanged));
 
@@ -100,6 +109,13 @@
       upstart_wrapper_->Emit("desktop-unlock");
       indicators_.reset();
     }
+    else if (!prompt_activation_)
+    {
+      screensaver_post_lock_timeout_.reset(new glib::TimeoutSeconds(POST_LOCK_SCREENSAVER_WAIT, [this] {
+        OnPresenceStatusChanged(true);
+        return false;
+      }));
+    }
   });
 
   blank_window_animator_.updated.connect([this](double value) {
@@ -108,67 +124,26 @@
   });
 
   blank_window_animator_.finished.connect([this] {
-    if (blank_window_animator_.GetCurrentValue() == 1.0)
-    {
-      dbus_manager_->active = true;
-
-      if (Settings::Instance().lock_on_blank())
-      {
-        int lock_delay = Settings::Instance().lock_delay();
-
-        lockscreen_delay_timeout_.reset(new glib::TimeoutSeconds(lock_delay, [this] {
-          RequestPromptScreenLock();
-          return false;
-        }));
-      }
-
-      std::for_each(shields_.begin(), shields_.end(), [](nux::ObjectPtr<Shield> const& shield) {
-        shield->UnGrabPointer();
-        shield->UnGrabKeyboard();
-      });
-
-      if (blank_window_)
-      {
-        blank_window_->EnableInputWindow(true);
-        blank_window_->GrabPointer();
-        blank_window_->GrabKeyboard();
-        blank_window_->PushToFront();
-        blank_window_->mouse_move.connect([this](int, int, int dx, int dy, unsigned long, unsigned long) {
-          if (dx || dy)
-          {
-            HideBlankWindow();
-            lockscreen_delay_timeout_.reset();
-          }
-        });
-      }
-    }
-    else
-    {
-      dbus_manager_->active = false;
-      lockscreen_delay_timeout_.reset();
-
-      if (blank_window_)
-      {
-        blank_window_->UnGrabPointer();
-        blank_window_->UnGrabKeyboard();
-      }
-
-      std::for_each(shields_.begin(), shields_.end(), [](nux::ObjectPtr<Shield> const& shield) {
-        if (!shield->primary())
-          return;
-
-        shield->GrabPointer();
-        shield->GrabKeyboard();
-      });
+    bool shown = blank_window_animator_.GetCurrentValue() == 1.0;
+    BlankWindowGrabEnable(shown);
+    dbus_manager_->active = shown;
+    lockscreen_delay_timeout_.reset();
+
+    if (shown && Settings::Instance().lock_on_blank())
+    {
+      int lock_delay = Settings::Instance().lock_delay();
+
+      lockscreen_delay_timeout_.reset(new glib::TimeoutSeconds(lock_delay, [this] {
+        session_manager_->PromptLockScreen();
+        return false;
+      }));
     }
   });
 }
 
 void Controller::ResetPostLockScreenSaver()
 {
-  if (opacity() == 1.0)
-    screensaver_post_lock_timeout_.reset();
-
+  screensaver_post_lock_timeout_.reset();
   HideBlankWindow();
 }
 
@@ -240,7 +215,7 @@
 
   if (!blank_window_)
   {
-    blank_window_ = new nux::BaseWindow();
+    blank_window_ = new BlankWindow();
     blank_window_->SetBackgroundLayer(new nux::ColorLayer(nux::color::Black, true));
     blank_window_->SetOpacity(blank_window_animator_.GetCurrentValue());
     blank_window_->ShowWindow(true);
@@ -251,15 +226,11 @@
   blank_window_->SetMinMaxSize(screen_geo.width, screen_geo.height);
 }
 
-void Controller::RequestPromptScreenLock()
-{
-  skip_animation_ = true;
-  session_manager_->LockScreen();
-  skip_animation_ = false;
-}
-
 void Controller::ShowBlankWindow()
 {
+  if (blank_window_ && blank_window_->GetOpacity() == 1.0)
+    return;
+
   EnsureBlankWindow();
   animation::StartOrReverse(blank_window_animator_, animation::Direction::FORWARD);
 }
@@ -272,15 +243,58 @@
   blank_window_->ShowWindow(false);
   blank_window_.Release();
   animation::SetValue(blank_window_animator_, animation::Direction::BACKWARD);
-}
-
-void Controller::OnLockRequested()
+  lockscreen_delay_timeout_.reset();
+}
+
+void Controller::BlankWindowGrabEnable(bool grab)
+{
+  if (!blank_window_)
+    return;
+
+  if (grab)
+  {
+    for (auto const& shield : shields_)
+    {
+      shield->UnGrabPointer();
+      shield->UnGrabKeyboard();
+    }
+
+    blank_window_->EnableInputWindow(true);
+    blank_window_->GrabPointer();
+    blank_window_->GrabKeyboard();
+    blank_window_->PushToFront();
+
+    blank_window_->mouse_move.connect([this](int, int, int dx, int dy, unsigned long, unsigned long) {
+      if ((dx || dy) && !lockscreen_timeout_) HideBlankWindow();
+    });
+    blank_window_->key_down.connect([this] (unsigned long, unsigned long e, unsigned long, const char*, unsigned short) {
+      if (!lockscreen_timeout_) HideBlankWindow();
+    });
+    blank_window_->mouse_down.connect([this] (int, int, unsigned long, unsigned long) {
+      if (!lockscreen_timeout_) HideBlankWindow();
+    });
+  }
+  else
+  {
+    blank_window_->UnGrabPointer();
+    blank_window_->UnGrabKeyboard();
+
+    for (auto const& shield : shields_)
+    {
+      if (!shield->primary())
+        continue;
+
+      shield->GrabPointer();
+      shield->GrabKeyboard();
+    }
+  }
+}
+
+void Controller::OnLockRequested(bool prompt)
 {
   if (Settings::Instance().use_legacy())
   {
     auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver");
-    // By passing the proxy to the lambda we ensure that it will stay alive
-    // until we get the last callback.
     proxy->CallBegin("Lock", nullptr, [proxy] (GVariant*, glib::Error const&) {});
     return;
   }
@@ -291,44 +305,51 @@
     return;
   }
 
-  HideBlankWindow();
-  bool skip_animation = skip_animation_;
-
-  lockscreen_timeout_.reset(new glib::Timeout(10, [this, skip_animation] {
+  if (prompt)
+  {
+    EnsureBlankWindow();
+    blank_window_->SetOpacity(1.0);
+  }
+
+  prompt_activation_ = prompt;
+
+  lockscreen_timeout_.reset(new glib::Timeout(30, [this] {
     bool grabbed_by_blank = (blank_window_ && blank_window_->OwnsPointerGrab());
 
     if (WindowManager::Default().IsScreenGrabbed() && !grabbed_by_blank)
     {
+      HideBlankWindow();
       LOG_DEBUG(logger) << "Failed to lock the screen: the screen is already grabbed.";
       return true; // keep trying
     }
 
+    if (!prompt_activation_)
+      HideBlankWindow();
+
     LockScreen();
     session_manager_->locked.emit();
 
-    if (skip_animation)
+    if (prompt_activation_)
     {
       animation::Skip(fade_animator_);
-    }
-    else
-    {
-      screensaver_post_lock_timeout_.reset(new glib::Timeout(POST_LOCK_SCREENSAVER_WAIT, [this] {
-        OnPresenceStatusChanged(true);
-        return false;
-      }));
+      HideBlankWindow();
     }
 
+    lockscreen_timeout_.reset();
     return false;
   }));
 }
 
 void Controller::OnPresenceStatusChanged(bool is_idle)
 {
+  if (Settings::Instance().use_legacy())
+    return;
+
   if (is_idle)
   {
     ShowBlankWindow();
   }
-  else
+  else if (!lockscreen_timeout_)
   {
     HideBlankWindow();
   }
@@ -336,9 +357,17 @@
 
 void Controller::OnScreenSaverActivationRequest(bool activate)
 {
+  if (Settings::Instance().use_legacy())
+  {
+    auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver");
+    proxy->CallBegin("SetActive", g_variant_new("(b)", activate != FALSE), [proxy] (GVariant*, glib::Error const&) {});
+    return;
+  }
+
   // It looks we need to do this after a small delay, not to get the screen back on
   screensaver_activation_timeout_.reset(new glib::Timeout(100, [this, activate] {
-    dbus_manager_->active = activate;
+    if (dbus_manager_->active() == activate)
+      return false;
 
     if (activate)
     {
@@ -391,14 +420,15 @@
   lockscreen_timeout_.reset();
   screensaver_post_lock_timeout_.reset();
 
-  if (!IsLocked())
-    return;
-
+  HideBlankWindow();
   HideShields();
 }
 
 void Controller::HideShields()
 {
+  if (!IsLocked())
+    return;
+
   std::for_each(shields_.begin(), shields_.end(), [](nux::ObjectPtr<Shield> const& shield) {
     shield->UnGrabPointer();
     shield->UnGrabKeyboard();

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-04-10 06:37:15 +0000
+++ lockscreen/LockScreenController.h	2014-04-10 06:37:15 +0000
@@ -57,11 +57,11 @@
   void HideShields();
   void ShowBlankWindow();
   void HideBlankWindow();
-  void RequestPromptScreenLock();
+  void BlankWindowGrabEnable(bool grab);
   void SimulateActivity();
   void ResetPostLockScreenSaver();
 
-  void OnLockRequested();
+  void OnLockRequested(bool prompt);
   void OnUnlockRequested();
   void OnPresenceStatusChanged(bool idle);
   void OnScreenSaverActivationRequest(bool activate);
@@ -81,7 +81,7 @@
   nux::animation::AnimateValue<double> blank_window_animator_;
 
   bool test_mode_;
-  bool skip_animation_;
+  bool prompt_activation_;
   BlurType old_blur_type_;
 
   connection::Wrapper uscreen_connection_;

=== modified file 'lockscreen/ScreenSaverDBusManager.cpp'
--- lockscreen/ScreenSaverDBusManager.cpp	2014-04-10 06:37:15 +0000
+++ lockscreen/ScreenSaverDBusManager.cpp	2014-04-10 06:37:15 +0000
@@ -64,25 +64,25 @@
   // This is a workaround we use to fallback to use gnome-screensaver if the screen reader is enabled
   Settings::Instance().use_legacy.changed.connect(sigc::hide(sigc::mem_fun(this, &DBusManager::EnsureService)));
 
-  object_->SetMethodsCallsHandler([this] (std::string const& method, GVariant* variant) -> GVariant* {
+  object_->SetMethodsCallsHandler([this] (std::string const& method, GVariant* parameters) -> GVariant* {
     if (method == "Lock")
     {
       session_->LockScreen();
     }
     else if (method == "GetActive")
     {
-      return g_variant_new("(b)", active_ ? TRUE : FALSE);
+      return g_variant_new("(b)", active() ? TRUE : FALSE);
     }
     else if (method == "GetActiveTime")
     {
-      if (time_)
-        return g_variant_new("(u)", time(nullptr) - time_);
+      return g_variant_new("(u)", time_ ? (time(nullptr) - time_) : 0);
+    }
+    else if (method == "SetActive")
+    {
+      if (glib::Variant(parameters).GetBool())
+        session_->ScreenSaverActivate();
       else
-        return g_variant_new("(u)", 0);
-    }
-    else if (method == "SetActive")
-    {
-      request_activate.emit(glib::Variant(variant).GetBool());
+        session_->ScreenSaverDeactivate();
     }
     else if (method == "SimulateUserActivity")
     {
@@ -117,11 +117,7 @@
 
 void DBusManager::SetActive(bool active)
 {
-  if (active)
-    time_ = time(nullptr);
-  else
-    time_ = 0;
-
+  time_ = active ? time(nullptr) : 0;
   object_->EmitSignal("ActiveChanged", g_variant_new("(b)", active ? TRUE : FALSE));
 }
 

=== modified file 'lockscreen/ScreenSaverDBusManager.h'
--- lockscreen/ScreenSaverDBusManager.h	2014-04-10 06:37:15 +0000
+++ lockscreen/ScreenSaverDBusManager.h	2014-04-10 06:37:15 +0000
@@ -39,7 +39,6 @@
   nux::Property<bool> active;
 
   sigc::signal<void> simulate_activity;
-  sigc::signal<void, bool> request_activate;
 
 private:
   void SetActive(bool active);
@@ -49,7 +48,6 @@
   glib::DBusServer::Ptr server_;
   glib::DBusObject::Ptr object_;
 
-  bool active_;
   time_t time_;
 };
 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-10 06:37:15 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-10 06:37:15 +0000
@@ -2874,6 +2874,7 @@
       gWindow->glPaintSetCurrentIndex(MAXSHORT);
       bool ret = gWindow->glPaint(wAttrib, matrix, region, mask);
       gWindow->glPaintSetCurrentIndex(old_index);
+      deco_win_->Paint(matrix, wAttrib, region, mask);
       return ret;
     }
   }
@@ -3820,7 +3821,6 @@
   // Setup Lockscreen Controller
   screensaver_dbus_manager_ = std::make_shared<lockscreen::DBusManager>(manager);
   lockscreen_controller_ = std::make_shared<lockscreen::Controller>(screensaver_dbus_manager_, manager);
-  lockscreen_controller_->opacity.changed.connect(sigc::hide(sigc::mem_fun(cScreen, &CompositeScreen::damageScreen)));
   UpdateActivateIndicatorsKey();
 
   auto on_launcher_size_changed = [this] (nux::Area* area, int w, int h) {

=== modified file 'shutdown/SessionDBusManager.cpp'
--- shutdown/SessionDBusManager.cpp	2014-03-07 05:24:32 +0000
+++ shutdown/SessionDBusManager.cpp	2014-04-10 06:37:15 +0000
@@ -41,6 +41,9 @@
       <arg type="s" direction="out" name="hostname" />
     </method>
     <method name="Lock" />
+    <method name="PromptLock" />
+    <method name="ActivateScreenSaver" />
+    <method name="DeactivateScreenSaver" />
     <method name="Logout" />
     <method name="RequestLogout" />
     <method name="Reboot" />
@@ -100,6 +103,18 @@
     {
       session_->LockScreen();
     }
+    else if (method == "PromptLock")
+    {
+      session_->PromptLockScreen();
+    }
+    else if (method == "ActivateScreenSaver")
+    {
+      session_->ScreenSaverActivate();
+    }
+    else if (method == "DeactivateScreenSaver")
+    {
+      session_->ScreenSaverDeactivate();
+    }
     else if (method == "Logout")
     {
       session_->Logout();
@@ -156,6 +171,9 @@
   connections_.Add(session_->lock_requested.connect([this] {
     object_->EmitSignal("LockRequested");
   }));
+  connections_.Add(session_->prompt_lock_requested.connect([this] {
+    object_->EmitSignal("LockRequested");
+  }));
   connections_.Add(session_->locked.connect([this] {
     object_->EmitSignal("Locked");
   }));

=== modified file 'shutdown/StandaloneSession.cpp'
--- shutdown/StandaloneSession.cpp	2014-03-07 02:01:38 +0000
+++ shutdown/StandaloneSession.cpp	2014-04-10 06:37:15 +0000
@@ -40,7 +40,10 @@
   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; }
   void Reboot() { std::cout << "Reboot" << std::endl; }
   void Shutdown() { std::cout << "Shutdown" << std::endl; }

=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2014-03-21 03:42:28 +0000
+++ tests/test_gnome_session_manager.cpp	2014-04-10 06:37:15 +0000
@@ -44,6 +44,9 @@
 
 const std::string SESSION_OPTIONS = "com.canonical.indicator.session";
 const std::string SUPPRESS_DIALOGS_KEY = "suppress-logout-restart-shutdown";
+
+const std::string GNOME_LOCKDOWN_OPTIONS = "org.gnome.desktop.lockdown";
+const std::string DISABLE_LOCKSCREEN_KEY = "disable-lock-screen";
 }
 
 namespace introspection
@@ -291,6 +294,12 @@
     g_settings_set_boolean(setting, SUPPRESS_DIALOGS_KEY.c_str(), enable ? FALSE : TRUE);
   }
 
+  void DisableScreenLocking(bool disable)
+  {
+    glib::Object<GSettings> setting(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
+    g_settings_set_boolean(setting, DISABLE_LOCKSCREEN_KEY.c_str(), disable ? TRUE : FALSE);
+  }
+
   enum class Action : unsigned
   {
     LOGOUT = 0,
@@ -1010,4 +1019,21 @@
   EXPECT_TRUE(unlock_emitted);
 }
 
+TEST_F(TestGnomeSessionManager, NoLockWhenLockingDisabled)
+{
+  bool lock_emitted = false;
+
+  manager->lock_requested.connect([&lock_emitted]()
+  {
+    lock_emitted = true;
+  });
+
+  DisableScreenLocking(true);
+
+  manager->LockScreen();
+  EXPECT_FALSE(lock_emitted);
+
+  DisableScreenLocking(false);
+}
+
 } // Namespace

=== modified file 'tests/test_mock_session_manager.h'
--- tests/test_mock_session_manager.h	2014-03-06 19:29:17 +0000
+++ tests/test_mock_session_manager.h	2014-04-10 06:37:15 +0000
@@ -33,7 +33,10 @@
   MOCK_CONST_METHOD0(UserName, std::string());
   MOCK_CONST_METHOD0(HostName, std::string());
 
+  MOCK_METHOD0(ScreenSaverActivate, void());
+  MOCK_METHOD0(ScreenSaverDeactivate, void());
   MOCK_METHOD0(LockScreen, void());
+  MOCK_METHOD0(PromptLockScreen, void());
   MOCK_METHOD0(Logout, void());
   MOCK_METHOD0(Reboot, void());
   MOCK_METHOD0(Shutdown, void());