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

[Andrea Azzarone]

Solves (or at least it should solve :) ) an old regression due to my mistake.

[Mirco Müller (macslow)]

Code looks ok, works as described.

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-08-19 15:23:50 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-08-21 16:35:34 +0000
@@ -35,8 +35,6 @@
 #include "Nux/BaseWindow.h"
 #include "Nux/WindowCompositor.h"
 
-#include "BamfLauncherIcon.h"
-#include "FavoriteStore.h"
 #include "Launcher.h"
 #include "LauncherIcon.h"
 #include "SpacerLauncherIcon.h"
@@ -2231,29 +2229,9 @@
       EnsureAnimation();
     }
     else
-    {
-
-      std::list<BamfLauncherIcon*> launchers;
-      std::list<BamfLauncherIcon*>::iterator it;
-      unity::FavoriteList desktop_paths;
-
-      // Updates gsettings favorites.
-      launchers = _model->GetSublist<BamfLauncherIcon> ();
-      for (it = launchers.begin(); it != launchers.end(); it++)
-      {
-        BamfLauncherIcon* icon = *it;
-
-        if (!icon->IsSticky())
-          continue;
-
-        const char* desktop_file = icon->DesktopFile();
-
-        if (desktop_file && strlen(desktop_file) > 0)
-          desktop_paths.push_back(desktop_file);
-      }
-
-      unity::FavoriteStore::GetDefault().SetFavorites(desktop_paths);
-
+    { 
+      _model->Save();
+        
       _drag_window->SetAnimationTarget((int)(_drag_icon->GetCenter().x), (int)(_drag_icon->GetCenter().y));
       _drag_window->StartAnimation();
 

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2011-08-03 03:01:46 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2011-08-21 16:35:34 +0000
@@ -99,30 +99,49 @@
     if (before)
       _model->ReorderBefore(result, before, false);
   }
+  
+  Save();
+}
+
+void LauncherController::Save()
+{
+  unity::FavoriteList desktop_paths;
+
+  // Updates gsettings favorites.
+  std::list<BamfLauncherIcon*> launchers = _model->GetSublist<BamfLauncherIcon> ();
+  for (auto icon : launchers)
+  {
+    if (!icon->IsSticky())
+      continue;
+
+    const char* desktop_file = icon->DesktopFile();
+
+    if (desktop_file && strlen(desktop_file) > 0)
+      desktop_paths.push_back(desktop_file);
+  }
+
+  unity::FavoriteStore::GetDefault().SetFavorites(desktop_paths);
 }
 
 void LauncherController::SortAndUpdate()
 {
-  std::list<BamfLauncherIcon*> launchers;
-  std::list<BamfLauncherIcon*>::iterator it;
-  FavoriteList desktop_paths;
   gint   shortcut = 1;
   gchar* buff;
 
-  launchers = _model->GetSublist<BamfLauncherIcon> ();
-  for (it = launchers.begin(); it != launchers.end(); it++)
+  std::list<BamfLauncherIcon*> launchers = _model->GetSublist<BamfLauncherIcon> ();
+  for (auto it : launchers)
   {
-    if (shortcut < 11 && (*it)->GetQuirk(LauncherIcon::QUIRK_VISIBLE))
+    if (shortcut < 11 && it->GetQuirk(LauncherIcon::QUIRK_VISIBLE))
     {
       buff = g_strdup_printf("%d", shortcut % 10);
-      (*it)->SetShortcut(buff[0]);
+      it->SetShortcut(buff[0]);
       g_free(buff);
       shortcut++;
     }
     // reset shortcut
     else
     {
-      (*it)->SetShortcut(0);
+      it->SetShortcut(0);
     }
   }
 }
@@ -367,5 +386,6 @@
   }
 
   _model->order_changed.connect(sigc::mem_fun(this, &LauncherController::SortAndUpdate));
+  _model->saved.connect(sigc::mem_fun(this, &LauncherController::Save));
 }
 

=== modified file 'plugins/unityshell/src/LauncherController.h'
--- plugins/unityshell/src/LauncherController.h	2011-07-26 12:33:23 +0000
+++ plugins/unityshell/src/LauncherController.h	2011-08-21 16:35:34 +0000
@@ -65,6 +65,7 @@
 
   guint32 _on_view_opened_id;
 
+  void Save();
   void SortAndUpdate();
 
   void OnIconAdded(LauncherIcon* icon);

=== modified file 'plugins/unityshell/src/LauncherModel.cpp'
--- plugins/unityshell/src/LauncherModel.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/LauncherModel.cpp	2011-08-21 16:35:34 +0000
@@ -142,6 +142,12 @@
 }
 
 void
+LauncherModel::Save()
+{
+  saved.emit();
+}
+
+void
 LauncherModel::Sort()
 {
   _inner_shelf.sort(&LauncherModel::CompareIcons);

=== modified file 'plugins/unityshell/src/LauncherModel.h'
--- plugins/unityshell/src/LauncherModel.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/LauncherModel.h	2011-08-21 16:35:34 +0000
@@ -37,6 +37,7 @@
 
   void AddIcon(LauncherIcon* icon);
   void RemoveIcon(LauncherIcon* icon);
+  void Save();
   void Sort();
   int  Size();
 
@@ -67,6 +68,7 @@
   sigc::signal<void, LauncherIcon*> icon_added;
   sigc::signal<void, LauncherIcon*> icon_removed;
   sigc::signal<void> order_changed;
+  sigc::signal<void> saved;
 
   // connected to from class Launcher
   sigc::connection on_icon_added_connection;