From 405a6969a0b2409d5f013e8d2845945b51146eb9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 14 Nov 2015 22:07:18 +0100
Subject: Fork from Ubuntu's indicator-session project.

---
 tests/backend-dbus/CMakeLists.txt         | 9 +++------
 tests/backend-dbus/mock-webcredentials.cc | 4 ++--
 tests/backend-dbus/test-actions.cc        | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'tests/backend-dbus')

diff --git a/tests/backend-dbus/CMakeLists.txt b/tests/backend-dbus/CMakeLists.txt
index 6ef68bd..5750d9d 100644
--- a/tests/backend-dbus/CMakeLists.txt
+++ b/tests/backend-dbus/CMakeLists.txt
@@ -42,21 +42,18 @@ add_executable (test-actions
                 test-actions.cc)
 add_test (test-actions test-actions)
 set_tests_properties (test-actions PROPERTIES COMPILE_FLAGS "${SERVICE_CFLAGS}")
-target_link_libraries (test-actions desktopmock backenddbus libindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
+target_link_libraries (test-actions desktopmock backenddbus libayatanaindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
 
 # test the Guest class
 add_executable (test-guest
                 test-guest.cc)
 add_test (test-guest test-guest)
 set_tests_properties (test-guest PROPERTIES COMPILE_FLAGS "${SERVICE_CFLAGS}")
-target_link_libraries (test-guest desktopmock backenddbus libindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
+target_link_libraries (test-guest desktopmock backenddbus libayatanaindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
 
 # test the Users class
 add_executable (test-users
                 test-users.cc)
 add_test (test-users test-users)
 set_tests_properties (test-users PROPERTIES COMPILE_FLAGS "${SERVICE_CFLAGS}")
-target_link_libraries (test-users desktopmock backenddbus libindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
-
-
-
+target_link_libraries (test-users desktopmock backenddbus libayatanaindicatorsessionservice gtest ${SERVICE_LDFLAGS} ${GTEST_LIBS} ${GCOV_LIBS})
diff --git a/tests/backend-dbus/mock-webcredentials.cc b/tests/backend-dbus/mock-webcredentials.cc
index 22e10b7..6406fc1 100644
--- a/tests/backend-dbus/mock-webcredentials.cc
+++ b/tests/backend-dbus/mock-webcredentials.cc
@@ -21,8 +21,8 @@
 
 namespace
 {
-  const char * const MY_NAME = "com.canonical.indicators.webcredentials";
-  const char * const MY_PATH = "/com/canonical/indicators/webcredentials";
+  const char * const MY_NAME = "org.ayatana.indicators.webcredentials";
+  const char * const MY_PATH = "/org/ayatana/indicators/webcredentials";
 }
 
 MockWebcredentials :: MockWebcredentials (GMainLoop       * loop,
diff --git a/tests/backend-dbus/test-actions.cc b/tests/backend-dbus/test-actions.cc
index ff5a24d..76a0ab4 100644
--- a/tests/backend-dbus/test-actions.cc
+++ b/tests/backend-dbus/test-actions.cc
@@ -45,7 +45,7 @@ class Actions: public GTestMockDBusFixture
       super :: SetUp ();
 
       // init 'actions'
-      indicator_settings = g_settings_new ("com.canonical.indicator.session");
+      indicator_settings = g_settings_new ("org.ayatana.indicator.session");
       cancellable = g_cancellable_new ();
       actions = 0;
       backend_get (cancellable, &actions, NULL, NULL);
-- 
cgit v1.2.3