Merge lp:~3v1n0/unity/cancellable-gnome-session-manager into lp:unity

[Marco Trevisan (Treviño)]

GnomeSessionManager: add gcancellable to instance and use it for calls with temporary proxies

This fixes various crashes when the session manager is destroyed while a temporary proxy
call is still in progress, and the callback is called afterwards.

[Eleni Maria Stea (hikiko)]

+1 :)

review: Approve

=== modified file 'UnityCore/GLibDBusProxy.cpp'
--- UnityCore/GLibDBusProxy.cpp	2015-11-24 16:40:03 +0000
+++ UnityCore/GLibDBusProxy.cpp	2017-01-17 15:51:00 +0000
@@ -609,7 +609,7 @@
   return nullptr;
 }
 
-void DBusProxy::GetProperty(std::string const& name, ReplyCallback const& callback)
+void DBusProxy::GetProperty(std::string const& name, ReplyCallback const& callback, GCancellable *cancellable)
 {
   if (!callback)
     return;
@@ -620,7 +620,8 @@
                            pimpl->name_.c_str(), pimpl->object_path_.c_str(),
                            "org.freedesktop.DBus.Properties",
                            "Get", g_variant_new ("(ss)", pimpl->interface_name_.c_str(), name.c_str()),
-                            G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, -1, pimpl->cancellable_,
+                            G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, -1,
+                            cancellable ? cancellable : pimpl->cancellable_,
                            [] (GObject *source, GAsyncResult *res, gpointer user_data) {
       glib::Error err;
       std::unique_ptr<ReplyCallback> callback(static_cast<ReplyCallback*>(user_data));
@@ -641,15 +642,16 @@
   else
   {
     // This will get the property as soon as we have a connection
+    glib::Object<GCancellable> canc(cancellable, AddRef());
     auto conn = std::make_shared<sigc::connection>();
-    *conn = connected.connect([this, conn, name, callback] {
-      GetProperty(name, callback);
+    *conn = connected.connect([this, conn, name, callback, canc] {
+      GetProperty(name, callback, canc);
       conn->disconnect();
     });
   }
 }
 
-void DBusProxy::SetProperty(std::string const& name, GVariant* value)
+void DBusProxy::SetProperty(std::string const& name, GVariant* value, GCancellable *cancellable)
 {
   if (IsConnected())
   {
@@ -657,7 +659,8 @@
                            pimpl->name_.c_str(), pimpl->object_path_.c_str(),
                            "org.freedesktop.DBus.Properties",
                            "Set", g_variant_new ("(ssv)", pimpl->interface_name_.c_str(), name.c_str(), value),
-                           nullptr, G_DBUS_CALL_FLAGS_NONE, -1, pimpl->cancellable_,
+                           nullptr, G_DBUS_CALL_FLAGS_NONE, -1,
+                           cancellable ? cancellable : pimpl->cancellable_,
                            [] (GObject *source, GAsyncResult *res, gpointer user_data) {
       glib::Error err;
       Variant result(g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &err), StealRef());
@@ -670,9 +673,10 @@
   else
   {
     // This will set the property as soon as we have a connection
+    glib::Object<GCancellable> canc(cancellable, AddRef());
     auto conn = std::make_shared<sigc::connection>();
-    *conn = connected.connect([this, conn, name, value] {
-      SetProperty(name, value);
+    *conn = connected.connect([this, conn, name, value, canc] {
+      SetProperty(name, value, canc);
       conn->disconnect();
     });
   }
 
=== modified file 'UnityCore/GLibDBusProxy.h'
--- UnityCore/GLibDBusProxy.h	2014-10-10 11:35:40 +0000
+++ UnityCore/GLibDBusProxy.h	2017-01-17 15:51:00 +0000
@@ -74,8 +74,8 @@
   bool IsConnected() const;
 
   Variant GetProperty(std::string const& property_name) const;
-  void GetProperty(std::string const& property_name, ReplyCallback const&);
-  void SetProperty(std::string const& property_name, GVariant* value);
+  void GetProperty(std::string const& property_name, ReplyCallback const&, GCancellable *cancellable = nullptr);
+  void SetProperty(std::string const& property_name, GVariant* value, GCancellable *cancellable = nullptr);
 
   void Connect(std::string const& signal_name, ReplyCallback const& callback);
   void DisconnectSignal(std::string const& signal_name = "");
 
=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2017-01-04 17:38:14 +0000
+++ UnityCore/GnomeSessionManager.cpp	2017-01-17 15:51:00 +0000
@@ -130,7 +130,7 @@
 
         glib::Variant tmp(g_variant_get_child_value(variant, 1), glib::StealRef());
         SetupLogin1Proxy(tmp.GetObjectPath());
-      });
+      }, cancellable_);
     }
   }
 
@@ -424,7 +424,7 @@
 
     if (cb)
       cb(ret, e);
-  });
+  }, cancellable_);
 }
 
 void GnomeManager::Impl::CallUPowerMethod(std::string const& method, glib::DBusProxy::ReplyCallback const& cb)
@@ -443,7 +443,7 @@
     {
       cb(ret);
     }
-  });
+  }, cancellable_);
 }
 
 void GnomeManager::Impl::CallLogindMethod(std::string const& method, GVariant* parameters, glib::DBusProxy::CallFinishedCallback const& cb)
@@ -465,7 +465,7 @@
     {
       cb(ret, e);
     }
-  });
+  }, cancellable_);
 }
 
 void GnomeManager::Impl::CallConsoleKitMethod(std::string const& method, GVariant* parameters)
@@ -482,7 +482,7 @@
     {
       LOG_ERROR(logger) << "Fallback call failed: " << e.Message();
     }
-  });
+  }, cancellable_);
 }
 
 void GnomeManager::Impl::CallDisplayManagerSeatMethod(std::string const& method, GVariant* parameters)
@@ -499,7 +499,7 @@
     {
       LOG_ERROR(logger) << "DisplayManager Seat call failed: " << e.Message();
     }
-  });
+  }, cancellable_);
 }
 
 void GnomeManager::Impl::LockScreen(bool prompt)
@@ -552,7 +552,7 @@
   glib::Variant inhibitors(g_dbus_connection_call_sync(bus, test_mode_ ? testing::DBUS_NAME.c_str() : "org.gnome.SessionManager",
                                                        "/org/gnome/SessionManager", "org.gnome.SessionManager",
                                                        "IsInhibited", g_variant_new("(u)", Inhibited::LOGOUT), nullptr,
-                                                       G_DBUS_CALL_FLAGS_NONE, 500, nullptr, &error));
+                                                       G_DBUS_CALL_FLAGS_NONE, 500, cancellable_, &error));
 
   if (error)
   {
@@ -600,7 +600,7 @@
   glib::Variant user_path(g_dbus_connection_call_sync(bus, "org.freedesktop.Accounts",
                                                       "/org/freedesktop/Accounts", "org.freedesktop.Accounts",
                                                       "FindUserByName", g_variant_new("(s)",g_get_user_name()), nullptr,
-                                                      G_DBUS_CALL_FLAGS_NONE, 500, nullptr, &error));
+                                                      G_DBUS_CALL_FLAGS_NONE, 500, cancellable_, &error));
 
   if (error)
   {
@@ -611,7 +611,7 @@
   glib::Variant autologin(g_dbus_connection_call_sync(bus, "org.freedesktop.Accounts",
                                                       user_path.GetObjectPath().c_str(), "org.freedesktop.DBus.Properties",
                                                       "Get", g_variant_new("(ss)", "org.freedesktop.Accounts.User", "AutomaticLogin"), nullptr,
-                                                      G_DBUS_CALL_FLAGS_NONE, 500, nullptr, &error));
+                                                      G_DBUS_CALL_FLAGS_NONE, 500, cancellable_, &error));
 
   if (error)
   {
 
=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
--- UnityCore/GnomeSessionManagerImpl.h	2017-01-04 15:46:47 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2017-01-17 15:51:00 +0000
@@ -85,6 +85,7 @@
   glib::DBusProxy::Ptr dm_proxy_;
   glib::DBusProxy::Ptr dm_seat_proxy_;
 
+  glib::Cancellable cancellable_;
   int open_sessions_;
 };
 
 
=== modified file 'unity-shared/SystemdWrapper.cpp'
--- unity-shared/SystemdWrapper.cpp	2016-09-01 23:50:10 +0000
+++ unity-shared/SystemdWrapper.cpp	2017-01-17 15:51:00 +0000
@@ -39,7 +39,6 @@
 
 private:
   bool test_mode_;
-  glib::DBusProxy::Ptr systemd_proxy_;
 };
 
 SystemdWrapper::Impl::Impl(bool test)