Merge lp:~3v1n0/unity/volume-imp-filemanager-crash-fix into lp:unity

[Marco Trevisan (Treviño)]

Trash and Device Icons: disconnect from FileManager signal on destruction

Disconnect from file-manager signal when TrashLauncherIcon or VolumeImp are deleted (this is done using sigc::mem_fun with a sigc::trackable object).

Tests added.

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2013-03-29 17:44:37 +0000
+++ launcher/TrashLauncherIcon.cpp	2013-04-03 20:48:24 +0000
@@ -69,13 +69,16 @@
     });
   }
 
-  file_manager_->locations_changed.connect([this] {
-    SetQuirk(Quirk::RUNNING, file_manager_->IsTrashOpened());
-  });
+  file_manager_->locations_changed.connect(sigc::mem_fun(this, &TrashLauncherIcon::OnOpenedLocationsChanged));
 
   UpdateTrashIcon();
 }
 
+void TrashLauncherIcon::OnOpenedLocationsChanged()
+{
+  SetQuirk(Quirk::RUNNING, file_manager_->IsTrashOpened());
+}
+
 AbstractLauncherIcon::MenuItemsVector TrashLauncherIcon::GetMenus()
 {
   MenuItemsVector result;

=== modified file 'launcher/TrashLauncherIcon.h'
--- launcher/TrashLauncherIcon.h	2013-03-29 17:44:37 +0000
+++ launcher/TrashLauncherIcon.h	2013-04-03 20:48:24 +0000
@@ -49,6 +49,7 @@
 
 private:
   void ActivateLauncherIcon(ActionArg arg);
+  void OnOpenedLocationsChanged();
   MenuItemsVector GetMenus();
 
   static void UpdateTrashIconCb(GObject* source, GAsyncResult* res, gpointer data);

=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2013-03-28 11:33:26 +0000
+++ launcher/VolumeImp.cpp	2013-04-03 20:48:24 +0000
@@ -32,7 +32,7 @@
 // Start private implementation
 //
 
-class VolumeImp::Impl
+class VolumeImp::Impl : public sigc::trackable
 {
 public:
   Impl(glib::Object<GVolume> const& volume,
@@ -54,15 +54,18 @@
       parent_->removed.emit();
     });
 
-    file_manager_->locations_changed.connect([this] {
-      bool opened = file_manager_->IsPrefixOpened(GetUri());
-
-      if (opened_ != opened)
-      {
-        opened_ = opened;
-        parent_->opened.emit(opened_);
-      }
-    });
+    file_manager_->locations_changed.connect(sigc::mem_fun(this, &Impl::OnLocationChanged));
+  }
+
+  void OnLocationChanged()
+  {
+    bool opened = file_manager_->IsPrefixOpened(GetUri());
+
+    if (opened_ != opened)
+    {
+      opened_ = opened;
+      parent_->opened.emit(opened_);
+    }
   }
 
   bool CanBeEjected() const

=== modified file 'tests/test_trash_launcher_icon.cpp'
--- tests/test_trash_launcher_icon.cpp	2013-03-29 17:54:52 +0000
+++ tests/test_trash_launcher_icon.cpp	2013-04-03 20:48:24 +0000
@@ -82,4 +82,15 @@
   EXPECT_FALSE(icon.GetQuirk(AbstractLauncherIcon::Quirk::RUNNING));
 }
 
+TEST_F(TestTrashLauncherIcon, FilemanagerSignalDisconnection)
+{
+  auto file_manager = std::make_shared<NiceMock<MockFileManager>>();
+  {
+    TrashLauncherIcon trash_icon(file_manager);
+    ASSERT_FALSE(file_manager->locations_changed.empty());
+  }
+
+  EXPECT_TRUE(file_manager->locations_changed.empty());
+}
+
 }

=== modified file 'tests/test_volume_imp.cpp'
--- tests/test_volume_imp.cpp	2013-03-28 11:33:26 +0000
+++ tests/test_volume_imp.cpp	2013-04-03 20:48:24 +0000
@@ -140,6 +140,14 @@
   EXPECT_TRUE(opened);
 }
 
+TEST_F(TestVolumeImp, TestFilemanagerSignalDisconnection)
+{
+  ASSERT_FALSE(file_manager_->locations_changed.empty());
+  volume_.reset();
+
+  EXPECT_TRUE(file_manager_->locations_changed.empty());
+}
+
 TEST_F(TestVolumeImp, TestEjectAndShowNotification)
 {
   g_mock_volume_set_can_eject(gvolume_, TRUE);