Merge lp:~azzar1/unity/lp-1237359-7.1 into lp:unity/7.1

[Andrea Azzarone]

Don't ignore Stick command is the icon is already sticky but save==true.

== Problem ==
Bug #1237359: [regression] Icons rearranged on Launcher not saved after reboot High In Progress

== Fix ==
Don't ignore Stick command is the icon is already sticky but save==true.

== Test ==
Unit tests updated.

[Christopher Townsend (townsend)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-10-10 13:00:42 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-10-11 14:57:31 +0000
@@ -858,7 +858,7 @@
 
 void ApplicationLauncherIcon::Stick(bool save)
 {
-  if (IsSticky())
+  if (IsSticky() && !save)
     return;
 
   app_->sticky = true;
 
=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-10-10 12:21:42 +0000
+++ launcher/LauncherIcon.cpp	2013-10-11 14:57:31 +0000
@@ -1145,7 +1145,7 @@
 
 void LauncherIcon::Stick(bool save)
 {
-  if (_sticky)
+  if (_sticky && !save)
     return;
 
   _sticky = true;
 
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-10-10 13:03:01 +0000
+++ tests/test_application_launcher_icon.cpp	2013-10-11 14:57:31 +0000
@@ -220,8 +220,9 @@
   EXPECT_TRUE(usc_icon->IsVisible());
   EXPECT_FALSE(saved);
 
+  EXPECT_CALL(*unity_app_, LogEvent(ApplicationEventType::ACCESS, _)).Times(1);
   usc_icon->Stick(true);
-  EXPECT_FALSE(saved);
+  EXPECT_TRUE(saved);
 }
 
 TEST_F(TestApplicationLauncherIcon, StickDesktopLessApp)
 
=== modified file 'tests/test_launcher_icon.cpp'
--- tests/test_launcher_icon.cpp	2013-09-30 15:31:43 +0000
+++ tests/test_launcher_icon.cpp	2013-10-11 14:57:31 +0000
@@ -87,7 +87,7 @@
   EXPECT_FALSE(saved);
 
   icon.Stick(true);
-  EXPECT_FALSE(saved);
+  EXPECT_TRUE(saved);
 }
 
 TEST_F(TestLauncherIcon, StickAndSave)