Merge lp:~jassmith/unity/unity.fix-drag-over-trash into lp:unity

[Jason Smith]

fix bug where icons would jump around when resorting over an icon not in their own group

Launcher still lacks any significant method of being tested for these kinds of changes. Significant refactoring is still required.

[Thomi Richards (thomir-deactivatedaccount)]

Looks good to me.

review: Approve

=== modified file 'plugins/unityshell/src/LauncherModel.cpp'
--- plugins/unityshell/src/LauncherModel.cpp	2012-02-14 00:26:48 +0000
+++ plugins/unityshell/src/LauncherModel.cpp	2012-02-21 06:53:18 +0000
@@ -215,7 +215,10 @@
 void
 LauncherModel::ReorderAfter(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other)
 {
-  if (icon == other)
+  if (icon == other || icon.IsNull() || other.IsNull())
+    return;
+
+  if (icon->GetIconType() != other->GetIconType())
     return;
 
   int i = 0;
@@ -245,7 +248,10 @@
 void
 LauncherModel::ReorderBefore(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other, bool save)
 {
-  if (icon == other)
+  if (icon == other || icon.IsNull() || other.IsNull())
+    return;
+
+  if (icon->GetIconType() != other->GetIconType())
     return;
 
   int i = 0;
@@ -286,7 +292,10 @@
 void
 LauncherModel::ReorderSmart(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other, bool save)
 {
-  if (icon == other)
+  if (icon == other || icon.IsNull() || other.IsNull())
+    return;
+
+  if (icon->GetIconType() != other->GetIconType())
     return;
 
   int i = 0;