Merge lp:~azzar1/unity/sh-72 into lp:unity/7.2

[Andrea Azzarone]

Improve the "lock on suspend" logic to always keep in sync the inhibitor with the lockscreen.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2015-10-21 15:54:37 +0000
+++ UnityCore/GnomeSessionManager.cpp	2016-04-07 11:57:30 +0000
@@ -115,8 +115,14 @@
       manager_->unlock_requested.emit();
     });
 
-    login_proxy_->ConnectProperty("Active", [this] (GVariant* active) {
-      manager_->screensaver_requested.emit(!glib::Variant(active).GetBool());
+    login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {
+      bool active = glib::Variant(variant).GetBool();
+      manager_->screensaver_requested.emit(!active);
+      manager_->is_session_active.changed.emit(active);
+    });
+
+    manager_->is_session_active.SetGetterFunction([this] {
+      return login_proxy_->GetProperty("Active").GetBool();
     });
   }
 

=== modified file 'UnityCore/SessionManager.h'
--- UnityCore/SessionManager.h	2014-07-23 18:56:11 +0000
+++ UnityCore/SessionManager.h	2016-04-07 11:57:30 +0000
@@ -40,6 +40,7 @@
 
   nux::ROProperty<bool> have_other_open_sessions;
   nux::Property<bool> is_locked;
+  nux::ROProperty<bool> is_session_active;
 
   virtual std::string RealName() const = 0;
   virtual std::string UserName() const = 0;

=== modified file 'lockscreen/CMakeLists.txt'
--- lockscreen/CMakeLists.txt	2014-12-16 19:27:36 +0000
+++ lockscreen/CMakeLists.txt	2016-04-07 11:57:30 +0000
@@ -27,8 +27,7 @@
      LockScreenAcceleratorController.cpp
      LockScreenAccelerators.cpp
      ScreenSaverDBusManager.cpp
-     ShutdownNotifier.cpp
-     SuspendNotifier.cpp
+     SuspendInhibitorManager.cpp
      UserAuthenticatorPam.cpp
      UserPromptView.cpp
      )

=== modified file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h	2014-12-15 19:12:07 +0000
+++ lockscreen/LockScreenAbstractShield.h	2016-04-07 11:57:30 +0000
@@ -21,19 +21,17 @@
 #define UNITY_LOCKSCREEN_ABSTRACT_SHIELD_H
 
 #include <NuxCore/Property.h>
-#include <UnityCore/SessionManager.h>
-#include <UnityCore/Indicators.h>
-
+#include "UnityCore/SessionManager.h"
+#include "UnityCore/Indicators.h"
 #include "unity-shared/MockableBaseWindow.h"
 #include "LockScreenAccelerators.h"
+#include "UserPromptView.h"
 
 namespace unity
 {
 namespace lockscreen
 {
 
-class UserPromptView;
-
 class AbstractShield : public MockableBaseWindow
 {
 public:

=== modified file 'lockscreen/LockScreenAcceleratorController.h'
--- lockscreen/LockScreenAcceleratorController.h	2014-07-23 18:56:11 +0000
+++ lockscreen/LockScreenAcceleratorController.h	2016-04-07 11:57:30 +0000
@@ -20,7 +20,7 @@
 #ifndef UNITY_LOCKSCREEN_ACCELERATOR_CONTROLLER
 #define UNITY_LOCKSCREEN_ACCELERATOR_CONTROLLER
 
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/SessionManager.h"
 #include "LockScreenAccelerators.h"
 
 namespace unity

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2015-05-15 19:39:03 +0000
+++ lockscreen/LockScreenController.cpp	2016-04-07 11:57:30 +0000
@@ -25,6 +25,7 @@
 
 #include "LockScreenShield.h"
 #include "LockScreenSettings.h"
+#include "UserPromptView.h"
 #include "unity-shared/AnimationUtils.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/WindowManager.h"
@@ -60,7 +61,7 @@
   , session_manager_(session_manager)
   , upstart_wrapper_(upstart_wrapper)
   , shield_factory_(shield_factory)
-  , suspend_notifier_(std::make_shared<SuspendNotifier>())
+  , suspend_inhibitor_manager_(std::make_shared<SuspendInhibitorManager>())
   , fade_animator_(LOCK_FADE_DURATION)
   , blank_window_animator_(IDLE_FADE_DURATION)
   , test_mode_(test_mode)
@@ -79,17 +80,22 @@
   });
   hidden_window_connection_->block();
 
-  suspend_notifier_->RegisterInterest([this](){
+  suspend_inhibitor_manager_->about_to_suspend.connect([this] () {
     if (Settings::Instance().lock_on_suspend())
       session_manager_->PromptLockScreen();
   });
 
+  Settings::Instance().lock_on_suspend.changed.connect(sigc::hide(sigc::mem_fun(this, &Controller::SyncInhibitor)));
+  Settings::Instance().use_legacy.changed.connect(sigc::hide(sigc::mem_fun(this, &Controller::SyncInhibitor)));
+  suspend_inhibitor_manager_->connected.connect(sigc::mem_fun(this, &Controller::SyncInhibitor));
+
   dbus_manager_->simulate_activity.connect(sigc::mem_fun(this, &Controller::SimulateActivity));
   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));
+  session_manager_->is_session_active.changed.connect(sigc::hide(sigc::mem_fun(this, &Controller::SyncInhibitor)));
 
   fade_animator_.updated.connect([this](double value) {
     std::for_each(shields_.begin(), shields_.end(), [value](nux::ObjectPtr<Shield> const& shield) {
@@ -100,6 +106,8 @@
   });
 
   fade_animator_.finished.connect([this] {
+    SyncInhibitor();
+
     if (animation::GetDirection(fade_animator_) == animation::Direction::BACKWARD)
     {
       primary_shield_connections_.Clear();
@@ -147,6 +155,8 @@
       }));
     }
   });
+
+  SyncInhibitor();
 }
 
 void Controller::ActivatePanel()
@@ -444,11 +454,6 @@
   indicators_ = std::make_shared<indicator::LockScreenDBusIndicators>();
   upstart_wrapper_->Emit("desktop-lock");
 
-  shutdown_notifier_ = std::make_shared<ShutdownNotifier>();
-  shutdown_notifier_->RegisterInterest([](){
-    WindowManager::Default().UnmapAllNoNuxWindowsSync();
-  });
-
   accelerator_controller_ = std::make_shared<AcceleratorController>(session_manager_);
   auto activate_key = WindowManager::Default().activate_indicators_key();
   auto accelerator = std::make_shared<Accelerator>(activate_key.second, 0, activate_key.first);
@@ -487,8 +492,6 @@
 
 void Controller::OnUnlockRequested()
 {
-  shutdown_notifier_.reset();
-
   lockscreen_timeout_.reset();
   screensaver_post_lock_timeout_.reset();
 
@@ -522,5 +525,19 @@
   return primary_shield_.IsValid() ? primary_shield_->IsIndicatorOpen() : false;
 }
 
+void Controller::SyncInhibitor()
+{
+  bool locked = IsLocked() && primary_shield_.IsValid() && primary_shield_->GetOpacity() == 1.0f;
+  bool inhibit = session_manager_->is_session_active() &&
+                 !locked &&
+                 Settings::Instance().lock_on_suspend() &&
+                 !Settings::Instance().use_legacy();
+
+  if (inhibit)
+    suspend_inhibitor_manager_->Inhibit("Unity needs to lock the screen");
+  else
+    suspend_inhibitor_manager_->Uninhibit();
+}
+
 } // lockscreen
 } // unity

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-12-16 19:27:36 +0000
+++ lockscreen/LockScreenController.h	2016-04-07 11:57:30 +0000
@@ -26,10 +26,8 @@
 
 #include "LockScreenShieldFactory.h"
 #include "LockScreenAcceleratorController.h"
+#include "SuspendInhibitorManager.h"
 #include "ScreenSaverDBusManager.h"
-#include "ShutdownNotifier.h"
-#include "SuspendNotifier.h"
-#include "UserPromptView.h"
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/UpstartWrapper.h"
 
@@ -70,6 +68,7 @@
   void ResetPostLockScreenSaver();
   void SetupPrimaryShieldConnections();
   void ActivatePanel();
+  void SyncInhibitor();
 
   void OnLockRequested(bool prompt);
   void OnUnlockRequested();
@@ -88,8 +87,7 @@
   AcceleratorController::Ptr accelerator_controller_;
   UpstartWrapper::Ptr upstart_wrapper_;
   ShieldFactoryInterface::Ptr shield_factory_;
-  ShutdownNotifier::Ptr shutdown_notifier_;
-  SuspendNotifier::Ptr suspend_notifier_;
+  SuspendInhibitorManager::Ptr suspend_inhibitor_manager_;
 
   nux::animation::AnimateValue<double> fade_animator_;
   nux::animation::AnimateValue<double> blank_window_animator_;

=== modified file 'lockscreen/LockScreenPanel.h'
--- lockscreen/LockScreenPanel.h	2014-04-30 00:45:17 +0000
+++ lockscreen/LockScreenPanel.h	2016-04-07 11:57:30 +0000
@@ -22,9 +22,9 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
-#include <UnityCore/Indicators.h>
-#include <UnityCore/GLibSource.h>
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/Indicators.h"
+#include "UnityCore/GLibSource.h"
+#include "UnityCore/SessionManager.h"
 
 namespace unity
 {

=== modified file 'lockscreen/LockScreenShieldFactory.h'
--- lockscreen/LockScreenShieldFactory.h	2014-12-08 21:56:36 +0000
+++ lockscreen/LockScreenShieldFactory.h	2016-04-07 11:57:30 +0000
@@ -22,6 +22,8 @@
 
 #include <Nux/Nux.h>
 #include "LockScreenAbstractShield.h"
+#include "UnityCore/SessionManager.h"
+#include "UnityCore/Indicators.h"
 
 namespace unity
 {

=== removed file 'lockscreen/ShutdownNotifier.cpp'
--- lockscreen/ShutdownNotifier.cpp	2014-12-16 19:27:36 +0000
+++ lockscreen/ShutdownNotifier.cpp	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Andrea Azzarone <[e-mail]>
- */
-
-#include "ShutdownNotifier.h"
-
-#include <NuxCore/Logger.h>
-#include "UnityCore/GLibDBusProxy.h"
-
-namespace unity
-{
-namespace lockscreen
-{
-
-DECLARE_LOGGER(logger, "unity.lockscreen.shutdownnotifier");
-
-//
-// Private Implementation
-//
-
-class ShutdownNotifier::Impl
-{
-public:
-  Impl();
-  ~Impl();
-
-  bool RegisterInterest(ShutdownCallback const& cb);
-  void UnregisterInterest();
-
-  void Inhibit();
-  void Uninhibit();
-  bool IsInhibited() const;
-
-private:
-  std::shared_ptr<glib::DBusProxy> logind_proxy_;
-  ShutdownCallback cb_;
-  gint delay_inhibit_fd_;
-};
-
-ShutdownNotifier::Impl::Impl()
-  : logind_proxy_(std::make_shared<glib::DBusProxy>("org.freedesktop.login1",
-                                                    "/org/freedesktop/login1",
-                                                    "org.freedesktop.login1.Manager",
-                                                    G_BUS_TYPE_SYSTEM))
-  , delay_inhibit_fd_(-1)
-{}
-
-ShutdownNotifier::Impl::~Impl()
-{
-  UnregisterInterest();
-}
-
-bool ShutdownNotifier::Impl::RegisterInterest(ShutdownCallback const& cb)
-{
-  if (!cb or cb_)
-    return false;
-
-  cb_ = cb;
-
-  Inhibit();
-
-  logind_proxy_->Connect("PrepareForShutdown", [this](GVariant* variant) {
-    bool active = glib::Variant(variant).GetBool();
-
-    if (active)
-    {
-      cb_();
-      UnregisterInterest();
-    }
-  });
-
-  return true;
-}
-
-void ShutdownNotifier::Impl::UnregisterInterest()
-{
-  if (!cb_)
-    return;
-
-  Uninhibit();
-
-  logind_proxy_->DisconnectSignal("PrepareForShutdown");
-  cb_ = nullptr;
-}
-
-void ShutdownNotifier::Impl::Inhibit()
-{
-  if (IsInhibited())
-    return;
-
-  GVariant* args = g_variant_new("(ssss)", "shutdown", "Unity Lockscreen", "Screen is locked", "delay");
-
-  logind_proxy_->CallWithUnixFdList("Inhibit", args, [this] (GVariant* variant, glib::Error const& e) {
-    if (e)
-    {
-      LOG_ERROR(logger) << "Failed to inhbit suspend";
-    }
-    delay_inhibit_fd_ = glib::Variant(variant).GetInt32();
-  });
-}
-
-void ShutdownNotifier::Impl::Uninhibit()
-{
-  if (!IsInhibited())
-    return;
-
-  close(delay_inhibit_fd_);
-  delay_inhibit_fd_ = -1;
-}
-
-bool ShutdownNotifier::Impl::IsInhibited() const
-{
-  return delay_inhibit_fd_ != -1;
-}
-
-//
-// End Private Implementation
-//
-
-ShutdownNotifier::ShutdownNotifier()
-  : pimpl_(new(Impl))
-{}
-
-ShutdownNotifier::~ShutdownNotifier()
-{}
-
-bool ShutdownNotifier::RegisterInterest(ShutdownCallback const& cb)
-{
-  return pimpl_->RegisterInterest(cb);
-}
-
-void ShutdownNotifier::UnregisterInterest()
-{
-  pimpl_->UnregisterInterest();
-}
-
-}
-}

=== removed file 'lockscreen/ShutdownNotifier.h'
--- lockscreen/ShutdownNotifier.h	2014-12-16 19:27:36 +0000
+++ lockscreen/ShutdownNotifier.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Andrea Azzarone <[e-mail]>
- */
-
-#ifndef UNITY_LOCKSCREEN_SHUTDOWN_NOTIFIER
-#define UNITY_LOCKSCREEN_SHUTDOWN_NOTIFIER
-
-#include <memory>
-#include <functional>
-
-namespace unity
-{
-namespace lockscreen
-{
-
-typedef std::function<void()> ShutdownCallback;
-
-class ShutdownNotifier
-{
-public:
-  typedef std::shared_ptr<ShutdownNotifier> Ptr;
-
-  ShutdownNotifier();
-  ~ShutdownNotifier();
-
-  bool RegisterInterest(ShutdownCallback const&);
-  void UnregisterInterest();
-
-private:
-  class Impl;
-  std::unique_ptr<Impl> pimpl_;
-};
-
-}
-}
-
-#endif

=== added file 'lockscreen/SuspendInhibitorManager.cpp'
--- lockscreen/SuspendInhibitorManager.cpp	1970-01-01 00:00:00 +0000
+++ lockscreen/SuspendInhibitorManager.cpp	2016-04-07 11:57:30 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include "SuspendInhibitorManager.h"
+
+#include <NuxCore/Logger.h>
+#include "UnityCore/GLibDBusProxy.h"
+
+namespace unity
+{
+namespace lockscreen
+{
+
+DECLARE_LOGGER(logger, "unity.lockscreen.suspendinhibitormanager");
+
+//
+// Private Implementation
+//
+
+class SuspendInhibitorManager::Impl
+{
+public:
+  Impl(SuspendInhibitorManager *parent);
+  ~Impl();
+
+  void Inhibit(std::string const&);
+  void Uninhibit();
+  bool IsInhibited();
+
+private:
+  SuspendInhibitorManager *parent_;
+  std::shared_ptr<glib::DBusProxy> lm_proxy_;
+  gint inhibitor_handler_;
+};
+
+SuspendInhibitorManager::Impl::Impl(SuspendInhibitorManager *parent)
+  : parent_(parent)
+  , inhibitor_handler_(-1)
+{
+  lm_proxy_ = std::make_shared<glib::DBusProxy>("org.freedesktop.login1",
+                                                "/org/freedesktop/login1",
+                                                "org.freedesktop.login1.Manager",
+                                                G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES);
+
+  lm_proxy_->Connect("PrepareForSleep", [this] (GVariant* variant) {
+    if (glib::Variant(variant).GetBool())
+      parent_->about_to_suspend.emit();
+  });
+
+  lm_proxy_->connected.connect(sigc::mem_fun(&parent->connected, &decltype(parent->connected)::emit));
+}
+
+SuspendInhibitorManager::Impl::~Impl()
+{}
+
+void SuspendInhibitorManager::Impl::Inhibit(std::string const& msg)
+{
+  if (IsInhibited())
+    return;
+
+  GVariant* args = g_variant_new("(ssss)", "sleep", "Unity", msg.c_str(), "delay");
+
+  lm_proxy_->CallWithUnixFdList("Inhibit", args, [this] (GVariant* variant, glib::Error const& e) {
+    if (e)
+    {
+      LOG_WARNING(logger) << "Failed to inhbit suspend";
+      return;
+    }
+
+    inhibitor_handler_ = glib::Variant(variant).GetInt32();
+  });
+}
+
+void SuspendInhibitorManager::Impl::Uninhibit()
+{
+  if (IsInhibited())
+  {
+    close(inhibitor_handler_);
+    inhibitor_handler_ = -1;
+  }
+}
+
+bool SuspendInhibitorManager::Impl::IsInhibited()
+{
+  return inhibitor_handler_ >= 0;
+}
+
+//
+// End Private Implementation
+//
+
+SuspendInhibitorManager::SuspendInhibitorManager()
+  : pimpl_(new Impl(this))
+{}
+
+SuspendInhibitorManager::~SuspendInhibitorManager()
+{}
+
+void SuspendInhibitorManager::Inhibit(std::string const& msg)
+{
+  pimpl_->Inhibit(msg);
+}
+
+void SuspendInhibitorManager::Uninhibit()
+{
+  pimpl_->Uninhibit();
+}
+
+bool SuspendInhibitorManager::IsInhibited()
+{
+  return pimpl_->IsInhibited();
+}
+
+
+}
+}

=== added file 'lockscreen/SuspendInhibitorManager.h'
--- lockscreen/SuspendInhibitorManager.h	1970-01-01 00:00:00 +0000
+++ lockscreen/SuspendInhibitorManager.h	2016-04-07 11:57:30 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITY_LOCKSCREEN_SUSPEND_INHIBITOR_MANAGER
+#define UNITY_LOCKSCREEN_SUSPEND_INHIBITOR_MANAGER
+
+#include <memory>
+#include <string>
+#include <sigc++/signal.h>
+
+namespace unity
+{
+namespace lockscreen
+{
+
+class SuspendInhibitorManager
+{
+public:
+  typedef std::shared_ptr<SuspendInhibitorManager> Ptr;
+
+  SuspendInhibitorManager();
+  ~SuspendInhibitorManager();
+
+  void Inhibit(std::string const&);
+  void Uninhibit();
+  bool IsInhibited();
+
+  sigc::signal<void> connected;
+  sigc::signal<void> about_to_suspend;
+
+private:
+  class Impl;
+  std::unique_ptr<Impl> pimpl_;
+};
+
+}
+}
+
+#endif

=== removed file 'lockscreen/SuspendNotifier.cpp'
--- lockscreen/SuspendNotifier.cpp	2014-12-16 19:27:36 +0000
+++ lockscreen/SuspendNotifier.cpp	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Andrea Azzarone <[e-mail]>
- */
-
-#include "SuspendNotifier.h"
-
-#include <NuxCore/Logger.h>
-#include "UnityCore/GLibDBusProxy.h"
-
-namespace unity
-{
-namespace lockscreen
-{
-
-DECLARE_LOGGER(logger, "unity.lockscreen.suspendnotifier");
-
-//
-// Private Implementation
-//
-
-class SuspendNotifier::Impl
-{
-public:
-  Impl();
-  ~Impl();
-
-  bool RegisterInterest(SuspendCallback const& cb);
-  void UnregisterInterest();
-
-  void Inhibit();
-  void Uninhibit();
-  bool IsInhibited() const;
-
-private:
-  std::shared_ptr<glib::DBusProxy> logind_proxy_;
-  SuspendCallback cb_;
-  gint delay_inhibit_fd_;
-};
-
-SuspendNotifier::Impl::Impl()
-  : logind_proxy_(std::make_shared<glib::DBusProxy>("org.freedesktop.login1",
-                                                    "/org/freedesktop/login1",
-                                                    "org.freedesktop.login1.Manager",
-                                                    G_BUS_TYPE_SYSTEM))
-  , delay_inhibit_fd_(-1)
-{}
-
-SuspendNotifier::Impl::~Impl()
-{
-  UnregisterInterest();
-}
-
-bool SuspendNotifier::Impl::RegisterInterest(SuspendCallback const& cb)
-{
-  if (!cb or cb_)
-    return false;
-
-  cb_ = cb;
-
-  Inhibit();
-
-  logind_proxy_->Connect("PrepareForSleep", [this](GVariant* variant) {
-    bool active = glib::Variant(variant).GetBool();
-
-    if (active) // suspending
-    {
-      cb_();
-      Uninhibit();
-    }
-    else // resuming
-    {
-      Inhibit();
-    }
-  });
-
-  return true;
-}
-
-void SuspendNotifier::Impl::UnregisterInterest()
-{
-  Uninhibit();
-
-  logind_proxy_->DisconnectSignal("PrepareForSleep");
-  cb_ = nullptr;
-}
-
-void SuspendNotifier::Impl::Inhibit()
-{
-  if (IsInhibited())
-    return;
-
-  GVariant* args = g_variant_new("(ssss)", "sleep", "Unity Lockscreen", "Unity wants to lock screen before suspending.", "delay");
-
-  logind_proxy_->CallWithUnixFdList("Inhibit", args, [this] (GVariant* variant, glib::Error const& e) {
-    if (e)
-    {
-      LOG_ERROR(logger) << "Failed to inhbit suspend";
-    }
-    delay_inhibit_fd_ = glib::Variant(variant).GetInt32();
-  });
-}
-
-void SuspendNotifier::Impl::Uninhibit()
-{
-  if (!IsInhibited())
-    return;
-
-  close(delay_inhibit_fd_);
-  delay_inhibit_fd_ = -1;
-}
-
-bool SuspendNotifier::Impl::IsInhibited() const
-{
-  return delay_inhibit_fd_ != -1;
-}
-
-//
-// End Private Implementation
-//
-
-SuspendNotifier::SuspendNotifier()
-  : pimpl_(new(Impl))
-{}
-
-SuspendNotifier::~SuspendNotifier()
-{}
-
-bool SuspendNotifier::RegisterInterest(SuspendCallback const& cb)
-{
-  return pimpl_->RegisterInterest(cb);
-}
-
-void SuspendNotifier::UnregisterInterest()
-{
-  pimpl_->UnregisterInterest();
-}
-
-}
-}

=== removed file 'lockscreen/SuspendNotifier.h'
--- lockscreen/SuspendNotifier.h	2014-12-16 19:27:36 +0000
+++ lockscreen/SuspendNotifier.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Andrea Azzarone <[e-mail]>
- */
-
-#ifndef UNITY_LOCKSCREEN_SUSPEND_NOTIFIER
-#define UNITY_LOCKSCREEN_SHUTDOWN_NOTIFIER
-
-#include <memory>
-#include <functional>
-
-namespace unity
-{
-namespace lockscreen
-{
-
-typedef std::function<void()> SuspendCallback;
-
-class SuspendNotifier
-{
-public:
-  typedef std::shared_ptr<SuspendNotifier> Ptr;
-
-  SuspendNotifier();
-  ~SuspendNotifier();
-
-  bool RegisterInterest(SuspendCallback const&);
-  void UnregisterInterest();
-
-private:
-  class Impl;
-  std::unique_ptr<Impl> pimpl_;
-};
-
-}
-}
-
-#endif
\ No newline at end of file

=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2014-12-08 22:02:13 +0000
+++ lockscreen/UserPromptView.h	2016-04-07 11:57:30 +0000
@@ -25,7 +25,7 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/SessionManager.h"
 
 #include "UserAuthenticatorPam.h"
 #include "unity-shared/IMTextEntry.h"

=== modified file 'lockscreen/pch/lockscreen_pch.hh'
--- lockscreen/pch/lockscreen_pch.hh	2014-03-07 18:35:10 +0000
+++ lockscreen/pch/lockscreen_pch.hh	2016-04-07 11:57:30 +0000
@@ -28,5 +28,5 @@
 #include <security/pam_appl.h>
 
 #include <Nux/Nux.h>
-#include <UnityCore/SessionManager.h>
-#include <UnityCore/Indicators.h>
\ No newline at end of file
+#include "UnityCore/SessionManager.h"
+#include "UnityCore/Indicators.h"
\ No newline at end of file

=== modified file 'shutdown/SessionController.h'
--- shutdown/SessionController.h	2014-02-17 04:05:06 +0000
+++ shutdown/SessionController.h	2016-04-07 11:57:30 +0000
@@ -26,7 +26,7 @@
 #include <Nux/BaseWindow.h>
 #include <Nux/HLayout.h>
 #include <NuxCore/Animation.h>
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/SessionManager.h"
 
 #include "SessionView.h"
 

=== modified file 'shutdown/SessionDBusManager.h'
--- shutdown/SessionDBusManager.h	2014-03-07 03:26:23 +0000
+++ shutdown/SessionDBusManager.h	2016-04-07 11:57:30 +0000
@@ -20,9 +20,9 @@
 #ifndef UNITYSHELL_SESSION_DBUS_MANAGER_H
 #define UNITYSHELL_SESSION_DBUS_MANAGER_H
 
-#include <UnityCore/ConnectionManager.h>
-#include <UnityCore/GLibDBusServer.h>
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/ConnectionManager.h"
+#include "UnityCore/GLibDBusServer.h"
+#include "UnityCore/SessionManager.h"
 
 namespace unity
 {

=== modified file 'shutdown/SessionView.h'
--- shutdown/SessionView.h	2014-07-23 18:56:11 +0000
+++ shutdown/SessionView.h	2016-04-07 11:57:30 +0000
@@ -26,7 +26,7 @@
 #include <Nux/HLayout.h>
 
 #include <UnityCore/GLibSource.h>
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/SessionManager.h"
 #include "unity-shared/EMConverter.h"
 #include "unity-shared/UnityWindowView.h"
 

=== modified file 'tests/test_mock_session_manager.h'
--- tests/test_mock_session_manager.h	2014-07-23 18:56:11 +0000
+++ tests/test_mock_session_manager.h	2016-04-07 11:57:30 +0000
@@ -18,7 +18,7 @@
  */
 
 #include <gmock/gmock.h>
-#include <UnityCore/SessionManager.h>
+#include "UnityCore/SessionManager.h"
 
 namespace unity
 {

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2015-10-15 16:13:20 +0000
+++ unity-shared/PluginAdapter.cpp	2016-04-07 11:57:30 +0000
@@ -1459,26 +1459,6 @@
     _last_focused_window = NULL;
 }
 
-void PluginAdapter::UnmapAllNoNuxWindowsSync()
-{
-  for (auto const& window : m_Screen->windows())
-  {
-    if (!IsNuxWindow(window) && (window->isMapped() || window->isViewable()))
-    {
-      if (window->overrideRedirect())
-      {
-        XUnmapWindow(m_Screen->dpy(), window->id());
-      }
-      else
-      {
-        window->hide();
-      }
-    }
-  }
-
-  XSync(m_Screen->dpy(), False);
-}
-
 bool PluginAdapter::IsNuxWindow(CompWindow* value)
 {
   std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2014-12-16 19:27:36 +0000
+++ unity-shared/PluginAdapter.h	2016-04-07 11:57:30 +0000
@@ -193,7 +193,6 @@
 
   Window GetTopWindowAbove(Window xid) const;
 
-  void UnmapAllNoNuxWindowsSync();
   static bool IsNuxWindow(CompWindow* value);
 
 protected:

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2015-05-15 14:12:01 +0000
+++ unity-shared/StandaloneWindowManager.h	2016-04-07 11:57:30 +0000
@@ -164,8 +164,6 @@
   virtual std::string GetStringProperty(Window window_id, Atom) const;
   virtual std::vector<long> GetCardinalProperty(Window window_id, Atom) const;
 
-  virtual void UnmapAllNoNuxWindowsSync() {};
-
   // Mock functions
   StandaloneWindow::Ptr GetWindowByXid(Window window_id) const;
   void AddStandaloneWindow(StandaloneWindow::Ptr const& window);

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2015-05-15 14:12:01 +0000
+++ unity-shared/WindowManager.h	2016-04-07 11:57:30 +0000
@@ -170,9 +170,6 @@
   virtual std::string GetStringProperty(Window, Atom) const = 0;
   virtual std::vector<long> GetCardinalProperty(Window, Atom) const = 0;
 
-  virtual void UnmapAllNoNuxWindowsSync() = 0;
-
-
   // Nux Modifiers, Nux Keycode (= X11 KeySym)
   nux::Property<std::pair<unsigned, unsigned>> close_window_key;
   nux::Property<std::pair<unsigned, unsigned>> activate_indicators_key;