Merge lp:~3v1n0/unity/screensaver-monitors-vt-changes into lp:unity

[Marco Trevisan (Treviño)]

GnomeSessionManager: Request ScreenSaver (de)activation on VT changes

Connect to login1 session active property, and monitor its state.
When the session is active we can safely request the screensaver to stop.

Test case:

sudo true && gdbus call --session --dest org.gnome.ScreenSaver --object-path /com/canonical/Unity/Session --method com.canonical.Unity.Session.ActivateScreenSaver && sleep 1 && sudo chvt 1 && sleep 1 && sudo chvt 7

Launching the script above in current unity, would cause it to switch VT and come back, but the screen will be blank. This change ensures the screen is turned on again.

[lp:~3v1n0/unity/screensaver-monitors-vt-changes]

3966. By Marco Trevisan (Treviño) on 2015-05-19

GnomeSessionManager: Request ScreenSaver (de)activation on VT changes

Connect to login1 session active property, and monitor its state.
When the session is active we can safely request the screensaver to stop.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3966
http://jenkins.qa.ubuntu.com/job/unity-ci/1227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/3

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Yep, issue is fixed and code looks good.

review: Approve

=== modified file 'UnityCore/GLibDBusProxy.cpp'
--- UnityCore/GLibDBusProxy.cpp	2014-10-22 15:26:56 +0000
+++ UnityCore/GLibDBusProxy.cpp	2015-05-19 18:41:50 +0000
@@ -89,7 +89,7 @@
 
   void OnProxyNameOwnerChanged(GDBusProxy*, GParamSpec*);
   void OnProxySignal(GDBusProxy* proxy, const char*, const char*, GVariant*);
-  void OnPropertyChanged(GDBusProxy*, GVariant*, GStrv*);
+  void OnPropertyChanged(GDBusProxy*, GVariant*, GStrv);
 
   static void OnProxyConnectCallback(GObject* source, GAsyncResult* res, gpointer impl);
   static void OnCallCallback(GObject* source, GAsyncResult* res, gpointer call_data);
@@ -114,7 +114,7 @@
   unsigned reconnection_attempts_;
 
   glib::Signal<void, GDBusProxy*, const char*, const char*, GVariant*> g_signal_connection_;
-  glib::Signal<void, GDBusProxy*, GVariant*, GStrv*> g_property_signal_;
+  glib::Signal<void, GDBusProxy*, GVariant*, GStrv> g_property_signal_;
   glib::Signal<void, GDBusProxy*, GParamSpec*> name_owner_signal_;
   glib::Source::UniquePtr reconnect_timeout_;
   sigc::signal<void> proxy_acquired;
@@ -277,7 +277,7 @@
   }
 }
 
-void DBusProxy::Impl::OnPropertyChanged(GDBusProxy* proxy, GVariant* changed_props, GStrv* invalidated)
+void DBusProxy::Impl::OnPropertyChanged(GDBusProxy* proxy, GVariant* changed_props, GStrv invalidated)
 {
   LOG_DEBUG(logger) << "Properties changed for proxy (" << object_path_ << ")";
 
@@ -303,6 +303,19 @@
 
     g_variant_iter_free (iter);
   }
+
+  for (const gchar *property_name = *invalidated; property_name; property_name = *(++invalidated))
+  {
+    LOG_DEBUG(logger) << "Property: '" << property_name << "' invalidated";
+
+    auto handler_it = property_handlers_.find(property_name);
+
+    if (handler_it != property_handlers_.end())
+    {
+      for (ReplyCallback const& callback : handler_it->second)
+        callback(nullptr);
+    }
+  }
 }
 
 void DBusProxy::Impl::WaitForProxy(GCancellable* cancellable,

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2015-01-24 00:56:37 +0000
+++ UnityCore/GnomeSessionManager.cpp	2015-05-19 18:41:50 +0000
@@ -104,7 +104,8 @@
     login_proxy_ = std::make_shared<glib::DBusProxy>(test_mode_ ? testing::DBUS_NAME : "org.freedesktop.login1",
                                                      "/org/freedesktop/login1/session/" + glib::gchar_to_string(session_id),
                                                      "org.freedesktop.login1.Session",
-                                                     test_mode_ ? G_BUS_TYPE_SESSION : G_BUS_TYPE_SYSTEM);
+                                                     test_mode_ ? G_BUS_TYPE_SESSION : G_BUS_TYPE_SYSTEM,
+                                                     G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES);
 
     login_proxy_->Connect("Lock", [this](GVariant*){
       manager_->PromptLockScreen();
@@ -113,6 +114,10 @@
     login_proxy_->Connect("Unlock", [this](GVariant*){
       manager_->unlock_requested.emit();
     });
+
+    login_proxy_->ConnectProperty("Active", [this] (GVariant* active) {
+      manager_->screensaver_requested.emit(!glib::Variant(active).GetBool());
+    });
   }
 
   {