Merge lp:~azzar1/unity/fix-1047760-6.0 into lp:unity/6.0

[Andrea Azzarone]

Unregister gdbus object in the dtor. Fix bug 1047760

See lp:~andyrock/unity/fix-1047760 too.

== Problem ==
compiz crashed with SIGSEGV in unity::launcher::LauncherModel::begin() from unity::launcher::LauncherModel::GetSublist() from unity::launcher::Controller::Impl::OnLauncherAddRequestSpecial()

== Fix ==
unregister gdbus object

== Test ==
not applicable

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

review: Approve

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-09-20 00:08:23 +0000
+++ launcher/LauncherController.cpp	2012-10-17 17:19:20 +0000
@@ -113,6 +113,8 @@
   , launcher_key_press_time_(0)
   , dbus_owner_(g_bus_own_name(G_BUS_TYPE_SESSION, DBUS_NAME.c_str(), G_BUS_NAME_OWNER_FLAGS_NONE,
                                OnBusAcquired, nullptr, nullptr, this, nullptr))
+  , gdbus_connection_(nullptr)
+  , reg_id_(0)
 {
   edge_barriers_.options = parent_->options();
 
@@ -165,6 +167,9 @@
       launcher_ptr->GetParent()->UnReference();
   }
 
+  if (gdbus_connection_ && reg_id_)
+    g_dbus_connection_unregister_object(gdbus_connection_, reg_id_);   
+
   g_bus_unown_name(dbus_owner_);
 }
 
@@ -1402,7 +1407,6 @@
 void Controller::Impl::OnBusAcquired(GDBusConnection* connection, const gchar* name, gpointer user_data)
 {
   GDBusNodeInfo* introspection_data = g_dbus_node_info_new_for_xml(DBUS_INTROSPECTION.c_str(), nullptr);
-  unsigned int reg_id;
 
   if (!introspection_data)
   {
@@ -1410,11 +1414,14 @@
     return;
   }
 
-  reg_id = g_dbus_connection_register_object(connection, DBUS_PATH.c_str(),
-                                             introspection_data->interfaces[0],
-                                             &interface_vtable, user_data,
-                                             nullptr, nullptr);
-  if (!reg_id)
+  auto self = static_cast<Controller::Impl*>(user_data);
+
+  self->gdbus_connection_ = connection;
+  self->reg_id_ = g_dbus_connection_register_object(connection, DBUS_PATH.c_str(),
+                                                    introspection_data->interfaces[0],
+                                                    &interface_vtable, user_data,
+                                                    nullptr, nullptr);
+  if (!self->reg_id_)
   {
     LOG_WARNING(logger) << "Object registration failed. Won't get dynamic launcher addition.";
   }
 
=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2012-09-17 14:57:22 +0000
+++ launcher/LauncherControllerPrivate.h	2012-10-17 17:19:20 +0000
@@ -135,8 +135,10 @@
   int reactivate_index;
   bool keynav_restore_window_;
   int launcher_key_press_time_;
+
   unsigned dbus_owner_;
-
+  GDBusConnection* gdbus_connection_;
+  unsigned reg_id_;
 
   glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
   glib::SourceManager sources_;