6 files changed, 17 insertions, 13 deletions
diff --git a/dash/previews/SocialPreviewContent.cpp b/dash/previews/SocialPreviewContent.cpp
index 065fae29a..62226cc92 100644
--- a/dash/previews/SocialPreviewContent.cpp
+++ b/dash/previews/SocialPreviewContent.cpp
@@ -169,17 +169,17 @@ void SocialPreviewContent::UpdateBaloonTexture()
 
 void SocialPreviewContent::RedrawBubble(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
 {
- double line_width = 6.0;
- double radius = 28.0;
- double x = 0.0;
- double y = 0.0;
-
 double width = MAX(0, cairo_image_surface_get_width(cairo_get_target(cr)));
 double height = MAX(0, cairo_image_surface_get_height(cairo_get_target(cr)) - TAIL_HEIGHT);
 
- double tailPosition = x + width - TAIL_POS_FROM_RIGHT - TAIL_HEIGHT;
+ double tailPosition = width - TAIL_POS_FROM_RIGHT - TAIL_HEIGHT;
 if (width > 0 && height > 0)
 {
+ double line_width = 6.0;
+ double radius = 28.0;
+ double x = 0.0;
+ double y = 0.0;
+
 DrawBubble(cr, line_width, radius, x, y, width, height, tailPosition, TAIL_HEIGHT);
 }
 }
diff --git a/launcher/SimpleLauncherIcon.cpp b/launcher/SimpleLauncherIcon.cpp
index 9a5f7120d..7138a0bf7 100644
--- a/launcher/SimpleLauncherIcon.cpp
+++ b/launcher/SimpleLauncherIcon.cpp
@@ -103,9 +103,9 @@ nux::BaseTexture* SimpleLauncherIcon::GetTextureForSize(int size)
 return 0;
 
 if (icon_string[0] == '/')
- texture_map[size] = TextureFromPath(icon_string.c_str(), size);
+ texture_map[size] = TextureFromPath(icon_string, size);
 else
- texture_map[size] = TextureFromGtkTheme(icon_string.c_str(), size);
+ texture_map[size] = TextureFromGtkTheme(icon_string, size);
 return texture_map[size];
 }
 
diff --git a/tests/autopilot/unity/tests/__init__.py b/tests/autopilot/unity/tests/__init__.py
index 0d96931dc..9a52acd6f 100644
--- a/tests/autopilot/unity/tests/__init__.py
+++ b/tests/autopilot/unity/tests/__init__.py
@@ -69,7 +69,7 @@ class UnityTestCase(AutopilotTestCase):
 #
 # Setting this here since the show desktop feature seems to be a bit
 # ropey. Once it's been proven to work reliably we can remove this line:
- self.set_unity_log_level("unity.plugin", "DEBUG")
+ self.set_unity_log_level("unity.wm.compiz", "DEBUG")
 
 def check_test_behavior(self):
 """Fail the test if it did something naughty.
diff --git a/tests/autopilot/unity/tests/launcher/test_icon_behavior.py b/tests/autopilot/unity/tests/launcher/test_icon_behavior.py
index 023a19333..f2ae129ab 100644
--- a/tests/autopilot/unity/tests/launcher/test_icon_behavior.py
+++ b/tests/autopilot/unity/tests/launcher/test_icon_behavior.py
@@ -232,9 +232,13 @@ class LauncherDragIconsBehavior(LauncherTestCase):
 # Normally we'd use get_icon(desktop_id="...") but we're expecting it to
 # not exist, and we don't want to wait for 10 seconds, so we do this
 # the old fashioned way.
- refresh_fn = lambda: self.launcher.model.get_children_by_type(
+ get_icon_fn = lambda: self.launcher.model.get_children_by_type(
 ApplicationLauncherIcon, desktop_id="gcalctool.desktop")
- self.assertThat(refresh_fn, Eventually(Equals([])))
+ calc_icon = get_icon_fn()
+ if calc_icon:
+ self.launcher_instance.unlock_from_launcher(calc_icon)
+
+ self.assertThat(get_icon_fn, Eventually(Equals([])))
 
 def test_can_drag_icon_below_bfb(self):
 """Application icons must be draggable to below the BFB."""
diff --git a/tests/autopilot/unity/tests/test_dash.py b/tests/autopilot/unity/tests/test_dash.py
index 5d7c7850a..2435e6580 100644
--- a/tests/autopilot/unity/tests/test_dash.py
+++ b/tests/autopilot/unity/tests/test_dash.py
@@ -19,7 +19,7 @@ from unity.tests import UnityTestCase
 class DashTestCase(UnityTestCase):
 def setUp(self):
 super(DashTestCase, self).setUp()
- self.set_unity_log_level("unity.shell", "DEBUG")
+ self.set_unity_log_level("unity.shell.compiz", "DEBUG")
 self.set_unity_log_level("unity.launcher", "DEBUG")
 self.dash.ensure_hidden()
 # On shutdown, ensure hidden too. Also add a delay. Cleanup is LIFO.
diff --git a/tests/autopilot/unity/tests/test_showdesktop.py b/tests/autopilot/unity/tests/test_showdesktop.py
index 3110d8f37..e6469fb77 100644
--- a/tests/autopilot/unity/tests/test_showdesktop.py
+++ b/tests/autopilot/unity/tests/test_showdesktop.py
@@ -19,7 +19,7 @@ class ShowDesktopTests(UnityTestCase):
 
 def setUp(self):
 super(ShowDesktopTests, self).setUp()
- self.set_unity_log_level("unity.plugin", "DEBUG")
+ self.set_unity_log_level("unity.wm.compiz", "DEBUG")
 # we need this to let the unity models update after we shutdown apps
 # before we start the next test.
 sleep(2)