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

[Andrea Azzarone]

Gives feedback when dropping an icon that's already in the launcher, following design directives.

More info @ bug #851619

[Mirco Müller (macslow)]

Works as described... approved.

review: Approve

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-09-19 16:36:21 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-09-22 15:26:36 +0000
@@ -777,6 +777,20 @@
   g_list_free(children);
 }
 
+void BamfLauncherIcon::Stick()
+{
+  BamfView* view = BAMF_VIEW(m_App);
+  
+  if (bamf_view_is_sticky(view))
+    return;
+  
+  const gchar* desktop_file = DesktopFile();
+  bamf_view_set_sticky(view, true);
+  
+  if (desktop_file && strlen(desktop_file) > 0)
+    FavoriteStore::GetDefault().AddFavorite(desktop_file, -1);
+}
+
 void BamfLauncherIcon::UnStick(void)
 {
   BamfView* view = BAMF_VIEW(this->m_App);

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2011-09-08 11:04:17 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2011-09-22 15:26:36 +0000
@@ -41,6 +41,7 @@
 
   const char* DesktopFile();
   bool IsSticky();
+  void Stick();
   void UnStick();
 
   void ActivateLauncherIcon(ActionArg arg);

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2011-09-12 12:11:28 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2011-09-22 15:26:36 +0000
@@ -73,17 +73,19 @@
   delete _model;
 }
 
+
 void
 LauncherController::OnLauncherAddRequest(char* path, LauncherIcon* before)
 {
-  std::list<BamfLauncherIcon*> launchers;
-  std::list<BamfLauncherIcon*>::iterator it;
-
-  launchers = _model->GetSublist<BamfLauncherIcon> ();
-  for (it = launchers.begin(); it != launchers.end(); it++)
+  for (auto it : _model->GetSublist<BamfLauncherIcon> ())
   {
-    if (!g_strcmp0(path, (*it)->DesktopFile()))
+    if (!g_strcmp0(path, it->DesktopFile()))
+    {
+      it->Stick();
+      _model->ReorderBefore(it, before, false);
+      Save();
       return;
+    }
   }
 
   LauncherIcon* result = CreateFavorite(path);