fixes the places icons and workspace manager icon so that you can't drag them out

(bzr r537)

4 files changed, 17 insertions, 16 deletions

diff --git a/unity-private/launcher/scroller-controller.vala b/unity-private/launcher/scroller-controller.vala
index 833338dfa..380d14f87 100644
--- a/unity-private/launcher/scroller-controller.vala
+++ b/unity-private/launcher/scroller-controller.vala
@@ -82,7 +82,7 @@ namespace Unity.Launcher
 
 var childcontroller = get_controller_for_view (model[index]);
 if (childcontroller is ScrollerChildController)
- { 
+ {
 childcontroller.activate ();
 }
 else
@@ -344,7 +344,6 @@ namespace Unity.Launcher
 {
 if (retcont is ScrollerChild)
 {
-
 if (retcont.enable_close_state == true)
 {
 retcont.enable_close_state = false;
@@ -370,6 +369,8 @@ namespace Unity.Launcher
 
 int model_index = view.get_model_index_at_y_pos_no_anim (y - 24, true);
 if (model_index < 0) return;
+ if (model[model_index].group_type != ScrollerChild.GroupType.APPLICATION)
+ return;
 
 //we have to check to see if we would still be over the index
 //if it was done animating
diff --git a/unity-private/places/places-place-entry-scroller-child.vala b/unity-private/places/places-place-entry-scroller-child.vala
index 1743be515..a683c6b90 100644
--- a/unity-private/places/places-place-entry-scroller-child.vala
+++ b/unity-private/places/places-place-entry-scroller-child.vala
@@ -16,12 +16,12 @@
 * Authored by Neil Jagdish Patel <neil.patel@canonical.com>
 *
 */
- 
+
 using Unity.Launcher;
- 
+
 namespace Unity.Places
 {
- 
+
 public class PlaceEntryScrollerChildController : ScrollerChildController
 {
 public PlaceEntry entry { get; construct; }
@@ -49,7 +49,7 @@ namespace Unity.Places
 private bool get_sections ()
 {
 Dee.Model sections;
- 
+
 /* We do this so the sections model actually populates with something
 * before we show it
 */
@@ -59,7 +59,7 @@ namespace Unity.Places
 
 return false;
 }
- 
+
 public override void activate ()
 {
 clicked (0);
@@ -77,7 +77,7 @@ namespace Unity.Places
 
 Dee.Model sections = entry.sections_model;
 unowned Dee.ModelIter iter = sections.get_first_iter ();
- 
+
 while (iter != null && !sections.is_last (iter))
 {
 var name = sections.get_string (iter, 0);
@@ -91,7 +91,7 @@ namespace Unity.Places
 clicked (item.property_get_int ("section-id"));
 });
 root.child_append (item);
- 
+
 iter = sections.next (iter);
 }
 
@@ -100,7 +100,7 @@ namespace Unity.Places
 
 public override bool can_drag ()
 {
- return true;
+ return false;
 }
 }
 }
diff --git a/unity-private/places/places-trash-controller.vala b/unity-private/places/places-trash-controller.vala
index 430c97a8d..32735fbc2 100644
--- a/unity-private/places/places-trash-controller.vala
+++ b/unity-private/places/places-trash-controller.vala
@@ -191,7 +191,7 @@ namespace Unity.Places
 
 public override bool can_drag ()
 {
- return true;
+ return false;
 }
 }
 }
diff --git a/unity-private/places/places-volume-child-controller.vala b/unity-private/places/places-volume-child-controller.vala
index 0e46203d9..66adfdb49 100644
--- a/unity-private/places/places-volume-child-controller.vala
+++ b/unity-private/places/places-volume-child-controller.vala
@@ -16,10 +16,10 @@
 * Authored by Neil Jagdish Patel <neil.patel@canonical.com>
 *
 */
- 
+
 using Unity.Launcher;
 using Unity.Testing;
- 
+
 namespace Unity.Places
 {
 public class VolumeChildController : ScrollerChildController
@@ -48,7 +48,7 @@ namespace Unity.Places
 private void on_volume_removed ()
 {
 ScrollerModel s;
- 
+
 s = ObjectRegistry.get_default ().lookup ("UnityScrollerModel")[0] as ScrollerModel;
 s.remove (this.child);
 
@@ -116,7 +116,7 @@ namespace Unity.Places
 {
 Dbusmenu.Menuitem root = new Dbusmenu.Menuitem ();
 root.set_root (true);
- 
+
 Dbusmenu.Menuitem item;
 
 item = new Dbusmenu.Menuitem ();
@@ -151,7 +151,7 @@ namespace Unity.Places
 
 public override bool can_drag ()
 {
- return true;
+ return false;
 }
 }
 }