merged in a fix for launcher not unfolding on startup

(bzr r467)

2 files changed, 4 insertions, 1 deletions

diff --git a/unity-private/launcher/scroller-view.vala b/unity-private/launcher/scroller-view.vala
index 18abbc571..df5d95331 100644
--- a/unity-private/launcher/scroller-view.vala
+++ b/unity-private/launcher/scroller-view.vala
@@ -1275,7 +1275,7 @@ namespace Unity.Launcher
 float position, float rotation,
 bool immediate = false)
 {
- if (immediate)
+ if (immediate || global_shell.is_starting)
 {
 child.position = position;
 child.force_rotation_jump (rotation);
diff --git a/unity-private/testing/test-window.vala b/unity-private/testing/test-window.vala
index 8dcaa7c3e..b65ded3dd 100644
--- a/unity-private/testing/test-window.vala
+++ b/unity-private/testing/test-window.vala
@@ -27,6 +27,7 @@ namespace Unity.Testing
 {
 public bool menus_swallow_events { get { return true; } }
 public bool super_key_active {get; set;}
+ public bool is_starting {get; set;}
 public bool is_popup { get; construct; }
 public int popup_width { get; construct; }
 public int popup_height { get; construct; }
@@ -54,6 +55,7 @@ namespace Unity.Testing
 
 construct
 {
+ is_starting = true;
 START_FUNCTION ();
 Unity.global_shell = this;
 this.workarea_size = new Workarea ();
@@ -159,6 +161,7 @@ namespace Unity.Testing
 
 gesture_dispatcher = new Gesture.XCBDispatcher ();
 
+ GLib.Idle.add (() => { is_starting = false; return false;});
 END_FUNCTION ();
 }