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 15:01:14 +0000
@@ -101,32 +101,27 @@
   });
 
   {
-    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())
+    {
+      SetupLogin1Proxy(session_id);
+    }
+    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) < 1)
+          return;
+
+        glib::Variant tmp(g_variant_get_child_value(variant, 0), glib::StealRef());
+        SetupLogin1Proxy(tmp.GetString());
+      });
+    }
   }
 
   {
@@ -221,6 +216,34 @@
   ClosedDialog();
 }
 
+void GnomeManager::Impl::SetupLogin1Proxy(std::string const& session_id)
+{
+  login_proxy_ = std::make_shared<glib::DBusProxy>(test_mode_ ? testing::DBUS_NAME : "org.freedesktop.login1",
+                                                   "/org/freedesktop/login1/session/" + 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();
+  });
+}
+
 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 15:01:14 +0000
@@ -46,6 +46,8 @@
   Impl(GnomeManager* parent, bool test_mode = false);
   ~Impl();
 
+  void SetupLogin1Proxy(std::string const& session_id);
+
   void ConfirmLogout();
   void ConfirmReboot();
   void ConfirmShutdown();

=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
--- decorations/DecorationsForceQuitDialog.cpp	2016-08-06 16:24:55 +0000
+++ decorations/DecorationsForceQuitDialog.cpp	2016-11-02 15:01:14 +0000
@@ -478,9 +478,11 @@
 
   void UpdateDialogPosition()
   {
+    gint scale = gtk_widget_get_scale_factor(dialog_);
+    scale = std::max<gint>(1, scale);
     auto const& win_geo = win_->inputRect();
-    nux::Size walloc(gtk_widget_get_allocated_width(dialog_), gtk_widget_get_allocated_height(dialog_));
-    gtk_window_move(GTK_WINDOW(dialog_), win_geo.centerX() - walloc.width/2, win_geo.centerY() - walloc.height/2);
+    nux::Size walloc(gtk_widget_get_allocated_width(dialog_) * scale, gtk_widget_get_allocated_height(dialog_) * scale);
+    gtk_window_move(GTK_WINDOW(dialog_), (win_geo.centerX() - walloc.width/2) / scale, (win_geo.centerY() - walloc.height/2) / scale);
   }
 
   ForceQuitDialog* parent_;