Merge lp:~azzar1/unity/fix-lp-1458950 into lp:unity

[Andrea Azzarone]

Make sure new icons are added to the model before calling SortAndUpdate.

Make sure new icons are added to the model before calling SortAndUpdate.

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3973
http://jenkins.qa.ubuntu.com/job/unity-ci/1247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1247/rebuild

review: Approve (continuous-integration)

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2015-05-12 13:09:39 +0000
+++ launcher/LauncherController.cpp	2015-05-29 12:47:16 +0000
@@ -757,14 +757,14 @@
     *uri_ptr = new_uri;
   });
 
+  model_->AddIcon(icon);
+
   if (icon->GetIconType() == AbstractLauncherIcon::IconType::APPLICATION)
   {
     icon->visibility_changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SortAndUpdate)));
     SortAndUpdate();
   }
 
-  model_->AddIcon(icon);
-
   std::string const& path = icon->DesktopFile();
 
   if (!path.empty())