Merge lp:~azzar1/unity/fix-double-lock into lp:unity

[Andrea Azzarone]

Retrieve the session id using dbus if env variable XDG_SESSION_ID is not available.

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2016-09-01 17:18:03 +0000
+++ UnityCore/GnomeSessionManager.cpp	2016-11-02 16:39:19 +0000
@@ -101,32 +101,37 @@
   });
 
   {
-    const char* session_id = test_mode_ ? "id0" : g_getenv("XDG_SESSION_ID");
-
-    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,
-                                                     G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES);
-
-    login_proxy_->Connect("Lock", [this](GVariant*){
-      manager_->PromptLockScreen();
-    });
-
-    login_proxy_->Connect("Unlock", [this](GVariant*){
-      manager_->unlock_requested.emit();
-    });
-
-    login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {
-      bool active = glib::Variant(variant).GetBool();
-      manager_->is_session_active.changed.emit(active);
-      if (active)
-        manager_->screensaver_requested.emit(false);
-    });
-
-    manager_->is_session_active.SetGetterFunction([this] {
-      return login_proxy_->GetProperty("Active").GetBool();
-    });
+    std::string session_id = test_mode_ ? "id0" : glib::gchar_to_string(g_getenv("XDG_SESSION_ID"));
+
+    if (!session_id.empty())
+    {
+      CallLogindMethod("GetSession", g_variant_new("(s)", session_id.c_str()), [this, session_id] (GVariant* variant, glib::Error const& err) {
+        std::string session_path;
+
+        if (!err && variant)
+          session_path = glib::Variant(variant).GetObjectPath();
+
+        if (session_path.empty())
+          session_path = "/org/freedesktop/login1/session/" + session_id;
+
+        SetupLogin1Proxy(session_path);
+      });
+    }
+    else
+    {
+      auto proxy = std::make_shared<glib::DBusProxy>("org.freedesktop.login1",
+                                                     "/org/freedesktop/login1/user/self",
+                                                     "org.freedesktop.login1.User",
+                                                     G_BUS_TYPE_SYSTEM);
+
+      proxy->GetProperty("Display", [this, proxy] (GVariant *variant) {
+        if (!variant || g_variant_n_children(variant) < 2)
+          return;
+
+        glib::Variant tmp(g_variant_get_child_value(variant, 1), glib::StealRef());
+        SetupLogin1Proxy(tmp.GetObjectPath());
+      });
+    }
   }
 
   {
@@ -221,6 +226,34 @@
   ClosedDialog();
 }
 
+void GnomeManager::Impl::SetupLogin1Proxy(std::string const& session_path)
+{
+  login_proxy_ = std::make_shared<glib::DBusProxy>(test_mode_ ? testing::DBUS_NAME : "org.freedesktop.login1",
+                                                   session_path,
+                                                   "org.freedesktop.login1.Session",
+                                                   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();
+  });
+
+  login_proxy_->Connect("Unlock", [this](GVariant*){
+    manager_->unlock_requested.emit();
+  });
+
+  login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {
+    bool active = glib::Variant(variant).GetBool();
+    manager_->is_session_active.changed.emit(active);
+    if (active)
+      manager_->screensaver_requested.emit(false);
+  });
+
+  manager_->is_session_active.SetGetterFunction([this] {
+    return login_proxy_->GetProperty("Active").GetBool();
+  });
+}
+
 bool GnomeManager::Impl::InteractiveMode()
 {
   bool schema_found = false;
 
=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
--- UnityCore/GnomeSessionManagerImpl.h	2015-12-03 05:57:00 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2016-11-02 16:39:19 +0000
@@ -46,6 +46,8 @@
   Impl(GnomeManager* parent, bool test_mode = false);
   ~Impl();
 
+  void SetupLogin1Proxy(std::string const& session_path);
+
   void ConfirmLogout();
   void ConfirmReboot();
   void ConfirmShutdown();
 
=== modified file 'UnityCore/Variant.cpp'
--- UnityCore/Variant.cpp	2013-11-19 20:28:13 +0000
+++ UnityCore/Variant.cpp	2016-11-02 16:39:19 +0000
@@ -174,6 +174,36 @@
   return result ? result : "";
 }
 
+std::string Variant::GetObjectPath() const
+{
+  const gchar *result = nullptr;
+
+  if (!variant_)
+    return "";
+
+  if (g_variant_is_of_type(variant_, G_VARIANT_TYPE_OBJECT_PATH))
+  {
+    // g_variant_get_string doesn't duplicate the string
+    result = g_variant_get_string(variant_, nullptr);
+  }
+  else if (g_variant_is_of_type(variant_, G_VARIANT_TYPE("(o)")))
+  {
+    // As we're using the '&' prefix we don't need to free the string!
+    g_variant_get(variant_, "(&o)", &result);
+  }
+  else
+  {
+    auto const& variant = get_variant(variant_);
+    if (variant)
+      return variant.GetObjectPath();
+
+    LOG_ERROR(logger) << "You're trying to extract a 'o' from a variant which is of type '"
+                      << g_variant_type_peek_string(g_variant_get_type(variant_)) << "'";
+  }
+
+  return result ? result : "";
+}
+
 template <typename TYPE, typename GTYPE>
 TYPE get_numeric_value(GVariant *variant_, const char *type_str, const char *fallback_type_str)
 {
 
=== modified file 'UnityCore/Variant.h'
--- UnityCore/Variant.h	2013-11-19 20:28:13 +0000
+++ UnityCore/Variant.h	2016-11-02 16:39:19 +0000
@@ -68,6 +68,7 @@
   ~Variant();
 
   std::string GetString() const;
+  std::string GetObjectPath() const;
   unsigned char GetByte() const;
   int16_t GetInt16() const;
   uint16_t GetUInt16() const;
 
=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2016-05-17 02:14:33 +0000
+++ tests/test_gnome_session_manager.cpp	2016-11-02 16:39:19 +0000
@@ -70,6 +70,9 @@
 const std::string LOGIND_MANAGER =
 R"(<node>
   <interface name="org.freedesktop.login1.Manager">
+    <method name="GetSession">
+      <arg type="s" name="result" direction="out"/>
+    </method>
     <method name="CanSuspend">
       <arg type="s" name="result" direction="out"/>
     </method>
@@ -186,7 +189,11 @@
     logind_->AddObjects(introspection::LOGIND_MANAGER, LOGIND_MANAGER_PATH);
     logind_->AddObjects(introspection::LOGIND_SESSION, LOGIND_SESSION_PATH);
     logind_->GetObjects().front()->SetMethodsCallsHandler([&] (std::string const& method, GVariant*) -> GVariant* {
-      if (method == "CanSuspend")
+      if (method == "GetSession")
+      {
+        return g_variant_new("(o)", "id0");
+      }
+      else if (method == "CanSuspend")
       {
         suspend_called = true;
         return g_variant_new("(s)", can_suspend_ ? "yes" : "no");