Merge lp:~3v1n0/unity/fix-icon-crash-on-null-app into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: remove the icon when setting a null application

Handle with care a new application pointer if that's a null app... In this case we can just remove the icon.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3565
http://jenkins.qa.ubuntu.com/job/unity-ci/429/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/317

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/429/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/unity-autolanding/350/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/306

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-10-07 18:35:17 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-10-09 02:41:21 +0000
@@ -97,7 +97,11 @@
 
 ApplicationLauncherIcon::~ApplicationLauncherIcon()
 {
-  SetApplication(nullptr);
+  if (app_)
+  {
+    app_->sticky = false;
+    app_->seen = false;
+  }
 }
 
 ApplicationPtr ApplicationLauncherIcon::GetApplication() const
@@ -110,18 +114,20 @@
   if (app_ == app)
     return;
 
+  if (!app)
+  {
+    Remove();
+    return;
+  }
+
   if (app_)
   {
     app_->sticky = false;
     app_->seen = false;
+    signals_conn_.Clear();
   }
 
-  signals_conn_.Clear();
   app_ = app;
-
-  if (!app)
-    return;
-
   app_->seen = true;
   SetupApplicationSignalsConnections();
 
@@ -242,8 +248,10 @@
    * launcher. Disconnecting from signals we make sure that this icon won't be
    * reused (no duplicated icon). */
   app_->seen = false;
+  app_->sticky = false;
   // Disconnect all our callbacks.
   notify_callbacks(); // This is from sigc++::trackable
+  signals_conn_.Clear();
   SimpleLauncherIcon::Remove();
 }
 

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2013-09-10 15:26:39 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2013-10-09 02:41:21 +0000
@@ -222,16 +222,20 @@
     auto const& new_app = app_manager.GetApplicationForDesktopFile(new_desktop_path);
     if (new_app) new_app->sticky = IsSticky();
     SetApplication(new_app);
-    Stick();
-
-    _source_manager.AddIdle([this] {
-      ShowTooltip();
-      _source_manager.AddTimeout(INSTALL_TIP_DURATION, [this] {
-        HideTooltip();
+
+    if (new_app)
+    {
+      Stick();
+
+      _source_manager.AddIdle([this] {
+        ShowTooltip();
+        _source_manager.AddTimeout(INSTALL_TIP_DURATION, [this] {
+          HideTooltip();
+          return false;
+        });
         return false;
       });
-      return false;
-    });
+    }
   }
   else
   {

=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2013-10-04 00:19:56 +0000
+++ tests/test_software_center_launcher_icon.cpp	2013-10-09 02:41:21 +0000
@@ -157,6 +157,25 @@
   EXPECT_TRUE(usc->icon.changed.empty());
 }
 
+TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedRemoveInvalidNewAppIcon)
+{
+  // Using an icon ptr, to get the removed signal to be properly emitted
+  nux::ObjectPtr<MockSoftwareCenterLauncherIcon> icon_ptr(
+    new MockSoftwareCenterLauncherIcon(usc, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON));
+
+  bool removed = false;
+  auto& app_manager = unity::ApplicationManager::Default();
+  auto mock_app_managed = dynamic_cast<MockApplicationManager*>(&app_manager);
+
+  EXPECT_CALL(*mock_app_managed, GetApplicationForDesktopFile(_)).WillOnce(Return(nullptr));
+  icon_ptr->remove.connect([&removed] (AbstractLauncherIcon::Ptr const&) { removed = true; });
+
+  icon_ptr->OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
+
+  Mock::VerifyAndClearExpectations(mock_app_managed);
+  EXPECT_TRUE(removed);
+}
+
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedSticksIcon)
 {
   ASSERT_FALSE(icon.IsSticky());