Merge lp:~3v1n0/unity/sticky-save-fix-6.0 into lp:unity/6.0

[Marco Trevisan (Treviño)]

BamfLauncherIcon: call Stick after that the icon is set sticky, so that the signal emission will work

And so the favorites will be correctly saved.

Backported branch lp:~3v1n0/unity/sticky-save-fix/+merge/126926

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1407/console reported an error when processing this lp:~3v1n0/unity/sticky-save-fix-6.0 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1413/console reported an error when processing this lp:~3v1n0/unity/sticky-save-fix-6.0 branch.
Not merging it.

=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-09-14 22:46:38 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-09-28 11:40:27 +0000
@@ -932,12 +932,12 @@
 
 void BamfLauncherIcon::Stick(bool save)
 {
+  if (IsSticky())
+    return;
+
+  bamf_view_set_sticky(BAMF_VIEW(_bamf_app.RawPtr()), true);
+
   SimpleLauncherIcon::Stick(save);
-
-  if (IsSticky())
-    return;
-
-  bamf_view_set_sticky(BAMF_VIEW(_bamf_app.RawPtr()), true);
 }
 
 void BamfLauncherIcon::UnStick()

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-09-20 00:14:30 +0000
+++ tests/test_launcher_controller.cpp	2012-09-28 11:40:27 +0000
@@ -163,14 +163,6 @@
       return FavoriteStore::URI_PREFIX_APP + remote_uri_;
   }
 
-  bool IsSticky() const
-  {
-    if (remote_uri_.empty())
-      return BamfLauncherIcon::IsSticky();
-    else
-      return SimpleLauncherIcon::IsSticky();
-  }
-
   void ReallyStick(bool save) { BamfLauncherIcon::Stick(save); }
 
   MOCK_METHOD1(Stick, void(bool));