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

[Andrea Azzarone]

Updates launcher icons shortcuts when removing icons from launcher.

[Marco Biscaro (marcobiscaro2112)]

+ std::cout << "OnIconRemoved" << std::endl;

This should not be here, right? But the code looks good.

review: Needs Fixing

[Marco Biscaro (marcobiscaro2112)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-01-07 17:09:23 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-01-10 15:31:27 +0000
@@ -65,6 +65,7 @@
   void SortAndUpdate();
 
   void OnIconAdded(LauncherIcon* icon);
+  void OnIconRemoved(LauncherIcon* icon);
 
   void OnLauncherAddRequest(char* path, LauncherIcon* before);
   void OnLauncherRemoveRequest(LauncherIcon* icon);
@@ -211,7 +212,7 @@
     if (before)
       model_->ReorderBefore(result, before, false);
   }
-  
+
   Save();
 }
 
@@ -263,6 +264,11 @@
   this->RegisterIcon(icon);
 }
 
+void Controller::Impl::OnIconRemoved(LauncherIcon* icon)
+{
+  SortAndUpdate();
+}
+
 void Controller::Impl::OnLauncherRemoveRequest(LauncherIcon* icon)
 {
   switch (icon->Type())
@@ -450,7 +456,7 @@
   BamfApplication* app;
   BamfLauncherIcon* icon;
 
-  // Sufficiently large number such that we ensure proper sorting 
+  // Sufficiently large number such that we ensure proper sorting
   // (avoids case where first item gets tacked onto end rather than start)
   int priority = 100;
 
@@ -489,6 +495,7 @@
   SortAndUpdate();
 
   model_->order_changed.connect(sigc::mem_fun(this, &Impl::SortAndUpdate));
+  model_->icon_removed.connect(sigc::mem_fun(this, &Impl::OnIconRemoved));
   model_->saved.connect(sigc::mem_fun(this, &Impl::Save));
   bamf_timer_handler_id_ = 0;
 }

=== modified file 'plugins/unityshell/src/LauncherModel.cpp'
--- plugins/unityshell/src/LauncherModel.cpp	2011-10-05 23:55:59 +0000
+++ plugins/unityshell/src/LauncherModel.cpp	2012-01-10 15:31:27 +0000
@@ -163,7 +163,7 @@
 {
   iterator it;
   iterator end;
-  
+
   if (icon && icon->Type() == AbstractLauncherIcon::TYPE_DEVICE)
     return true;