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

[Andrea Azzarone]

Tries to solve bug #733425.
According to me, updating gsettings during the drag and drop has no sense, so update it at the end of the drag and drop.

[Mirco Müller (macslow)]

Does indeed get rid of disk-I/O during the drag... nice! Approved!

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-06-30 15:21:07 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-07-10 10:01:23 +0000
@@ -34,6 +34,8 @@
 #include "Nux/BaseWindow.h"
 #include "Nux/WindowCompositor.h"
 
+#include "BamfLauncherIcon.h"
+#include "FavoriteStore.h"
 #include "Launcher.h"
 #include "LauncherIcon.h"
 #include "SpacerLauncherIcon.h"
@@ -2995,6 +2997,28 @@
     }
     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);
+      
       _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-06-05 00:30:33 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2011-07-10 10:01:23 +0000
@@ -115,7 +115,7 @@
   }
 }
 
-void LauncherController::SortAndSave()
+void LauncherController::SortAndUpdate()
 {
   std::list<BamfLauncherIcon *> launchers;
   std::list<BamfLauncherIcon *>::iterator it;
@@ -126,8 +126,6 @@
   launchers = _model->GetSublist<BamfLauncherIcon> ();
   for (it = launchers.begin (); it != launchers.end (); it++)
   {
-    BamfLauncherIcon *icon = *it;
-
     if (shortcut < 11 && (*it)->GetQuirk (LauncherIcon::QUIRK_VISIBLE))
     {
       buff = g_strdup_printf ("%d", shortcut % 10);
@@ -140,17 +138,7 @@
     {
       (*it)->SetShortcut (0);
     }
-
-    if (!icon->IsSticky ())
-      continue;
-
-    const char* desktop_file = icon->DesktopFile ();
-
-    if (desktop_file && strlen (desktop_file) > 0)
-      desktop_paths.push_back(desktop_file);
   }
-
-  FavoriteStore::GetDefault().SetFavorites(desktop_paths);
 }
 
 void
@@ -373,6 +361,6 @@
     RegisterIcon (icon);
   }
   
-  _model->order_changed.connect (sigc::mem_fun (this, &LauncherController::SortAndSave));
+  _model->order_changed.connect (sigc::mem_fun (this, &LauncherController::SortAndUpdate));
 }
 

=== modified file 'plugins/unityshell/src/LauncherController.h'
--- plugins/unityshell/src/LauncherController.h	2011-06-05 00:30:33 +0000
+++ plugins/unityshell/src/LauncherController.h	2011-07-10 10:01:23 +0000
@@ -71,7 +71,7 @@
 
     guint32 _on_view_opened_id;
 
-    void SortAndSave ();
+    void SortAndUpdate ();
 
     void OnIconAdded (LauncherIcon *icon);