move the launcher-position from com.canonical.Unity to com.canonical.Unity.Launcher

(bzr r3999.7.18)

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/autopilot/unity/tests/launcher/__init__.py b/tests/autopilot/unity/tests/launcher/__init__.py
index ba79fe089..6371cb339 100644
--- a/tests/autopilot/unity/tests/launcher/__init__.py
+++ b/tests/autopilot/unity/tests/launcher/__init__.py
@@ -50,9 +50,9 @@ class LauncherTestCase(UnityTestCase):
 self.set_unity_option('num_launchers', int(self.only_primary))
 self.launcher_instance = self.get_launcher()
 
- old_pos = self.call_gsettings_cmd('get', 'com.canonical.Unity', 'launcher-position')
- self.call_gsettings_cmd('set', 'com.canonical.Unity', 'launcher-position', '"%s"' % self.launcher_position)
- self.addCleanup(self.call_gsettings_cmd, 'set', 'com.canonical.Unity', 'launcher-position', old_pos)
+ old_pos = self.call_gsettings_cmd('get', 'com.canonical.Unity.Launcher', 'launcher-position')
+ self.call_gsettings_cmd('set', 'com.canonical.Unity.Launcher', 'launcher-position', '"%s"' % self.launcher_position)
+ self.addCleanup(self.call_gsettings_cmd, 'set', 'com.canonical.Unity.Launcher', 'launcher-position', old_pos)
 
 if not self.launcher_instance:
 self.skipTest("Cannot run test with no Launcher on monitor %d." % self.launcher_monitor)
diff --git a/tests/autopilot/unity/tests/test_quicklist.py b/tests/autopilot/unity/tests/test_quicklist.py
index ea7245bd7..a6a197196 100644
--- a/tests/autopilot/unity/tests/test_quicklist.py
+++ b/tests/autopilot/unity/tests/test_quicklist.py
@@ -245,9 +245,9 @@ class QuicklistKeyNavigationTests(UnityTestCase):
 
 self.ql_launcher = self.unity.launcher.get_launcher_for_monitor(0)
 
- old_pos = self.call_gsettings_cmd('get', 'com.canonical.Unity', 'launcher-position')
- self.call_gsettings_cmd('set', 'com.canonical.Unity', 'launcher-position', '"%s"' % self.launcher_position)
- self.addCleanup(self.call_gsettings_cmd, 'set', 'com.canonical.Unity', 'launcher-position', old_pos)
+ old_pos = self.call_gsettings_cmd('get', 'com.canonical.Unity.Launcher', 'launcher-position')
+ self.call_gsettings_cmd('set', 'com.canonical.Unity.Launcher', 'launcher-position', '"%s"' % self.launcher_position)
+ self.addCleanup(self.call_gsettings_cmd, 'set', 'com.canonical.Unity.Launcher', 'launcher-position', old_pos)
 
 def open_quicklist_with_mouse(self):
 """Opens a quicklist with the mouse."""
diff --git a/tests/test_launcher.cpp b/tests/test_launcher.cpp
index e4e5456e0..c48812152 100644
--- a/tests/test_launcher.cpp
+++ b/tests/test_launcher.cpp
@@ -538,7 +538,7 @@ TEST_F(TestLauncher, EdgeBarriersIgnoreEvents)
 
 TEST_F(TestLauncher, EdgeBarriersHandlesEvent)
 {
- glib::Object<GSettings> gsettings(g_settings_new("com.canonical.Unity"));
+ glib::Object<GSettings> gsettings(g_settings_new("com.canonical.Unity.Launcher"));
 auto launcher_geo = launcher_->GetAbsoluteGeometry();
 auto barrier = std::make_shared<ui::PointerBarrierWrapper>();
 auto event = std::make_shared<ui::BarrierEvent>(0, 0, 0, 100);
diff --git a/tests/test_launcher_controller.cpp b/tests/test_launcher_controller.cpp
index 2d717629b..3612758da 100644
--- a/tests/test_launcher_controller.cpp
+++ b/tests/test_launcher_controller.cpp
@@ -487,7 +487,7 @@ TEST_F(TestLauncherController, MonitorResizesLauncher)
 
 TEST_F(TestLauncherController, LauncherPositionResetsOnGsettingsUpdated)
 {
- glib::Object<GSettings> gsettings(g_settings_new("com.canonical.Unity"));
+ glib::Object<GSettings> gsettings(g_settings_new("com.canonical.Unity.Launcher"));
 g_settings_set_enum(gsettings, "launcher-position", static_cast<int>(LauncherPosition::LEFT));
 nux::Geometry const& monitor_geo = uscreen.GetMonitorGeometry(0);
 nux::Geometry launcher_geo = lc.launcher().GetAbsoluteGeometry();
@@ -501,7 +501,7 @@ TEST_F(TestLauncherController, LauncherPositionResetsOnGsettingsUpdated)
 ASSERT_EQ(launcher_geo.y, monitor_geo.y + monitor_geo.height - launcher_geo.height + 1);
 ASSERT_EQ(launcher_geo.width, monitor_geo.width);
 
- g_settings_reset(gsettings, "launcher_position");
+ g_settings_reset(gsettings, "launcher-position");
 }
 
 TEST_F(TestLauncherController, IconCentersResetsOnMonitorsUpdated)