Merge with trunk

(bzr r266.2.18)

2 files changed, 14 insertions, 6 deletions

diff --git a/unity-private/testing/test-utils.vala b/unity-private/testing/test-utils.vala
index 8ceb3ba9d..3660657ef 100644
--- a/unity-private/testing/test-utils.vala
+++ b/unity-private/testing/test-utils.vala
@@ -54,6 +54,14 @@ namespace Unity.Testing
 if ("is currently inside an allocation cycle" in message)
 return false;
 
+
+ // ignore liblauncher - we don't want to test liblauncher its going away
+ if ("liblauncher" in log_domain)
+ return false;
+
+ if ("Gtk" in log_domain)
+ return false;
+
 return true;
 }
 
diff --git a/unity-private/testing/test-window.vala b/unity-private/testing/test-window.vala
index bdcd380bf..d6599724c 100644
--- a/unity-private/testing/test-window.vala
+++ b/unity-private/testing/test-window.vala
@@ -38,7 +38,7 @@ namespace Unity.Testing
 private bool is_showing;
 
 private Background background;
- private Quicklauncher.View quicklauncher;
+ private Launcher.Launcher launcher;
 private Panel.View panel;
 private Places.Controller controller;
 private Unity.Places.View places;
@@ -133,9 +133,9 @@ namespace Unity.Testing
 this.stage.add_actor (this.background);
 this.background.show ();
 
- this.quicklauncher = new Quicklauncher.View (this);
- this.stage.add_actor (this.quicklauncher);
- this.quicklauncher.show ();
+ this.launcher = new Launcher.Launcher (this);
+ this.stage.add_actor (this.launcher.get_view ());
+ this.launcher.get_view ().show ();
 
 if (this.places_enabled)
 {
@@ -213,8 +213,8 @@ namespace Unity.Testing
 this.background.set_position (0, 0);
 this.background.set_size (width, height);
 
- this.quicklauncher.set_size (ql_width, height - 23);
- this.quicklauncher.set_position (0, 23);
+ this.launcher.get_view ().set_size (ql_width, height - 23);
+ this.launcher.get_view ().set_position (0, 23);
 
 if (this.places_enabled)
 {