[next] telepathy-glib: manager files have been moved to telepathy-1/

[Guillaume Desmottes]

Module: telepathy-glib
Branch: next
Commit: 5a8dd6df94833eeda2c173ed6ef1e20b5e9e788d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=5a8dd6df94833eeda2c173ed6ef1e20b5e9e788d

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Oct 29 15:17:40 2013 +0100

manager files have been moved to telepathy-1/

---

 telepathy-glib/connection-manager.c                |    4 ++--
 tests/dbus/Makefile.am                             |   14 +++++++-------
 .../managers/spurious.manager                      |    0
 .../managers/test_manager_file.manager             |    0
 .../managers/test_manager_file_invalid.manager     |    0
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 541c7df..d7cc063 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -739,7 +739,7 @@ tp_connection_manager_find_manager_file (const gchar *name)
 
   g_assert (name != NULL);
 
-  filename = g_strdup_printf ("%s/telepathy/managers/%s.manager",
+  filename = g_strdup_printf ("%s/telepathy-1/managers/%s.manager",
       g_get_user_data_dir (), name);
 
   DEBUG ("in XDG_DATA_HOME: trying %s", filename);
@@ -753,7 +753,7 @@ tp_connection_manager_find_manager_file (const gchar *name)
        *data_dirs != NULL;
        data_dirs++)
     {
-      filename = g_strdup_printf ("%s/telepathy/managers/%s.manager",
+      filename = g_strdup_printf ("%s/telepathy-1/managers/%s.manager",
           *data_dirs, name);
 
       DEBUG ("in XDG_DATA_DIRS: trying %s", filename);
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index a2978e1..c39d2fd 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -57,11 +57,11 @@ tests_list = \
     test-unsupported-interface
 
 if ENABLE_INSTALLED_TESTS
-managersdir = @tpglibtestsdir@/telepathy/managers/
+managersdir = @tpglibtestsdir@/telepathy-1/managers/
 managers_DATA = \
-	telepathy/managers/spurious.manager \
-	telepathy/managers/test_manager_file_invalid.manager \
-	telepathy/managers/test_manager_file.manager \
+	telepathy-1/managers/spurious.manager \
+	telepathy-1/managers/test_manager_file_invalid.manager \
+	telepathy-1/managers/test_manager_file.manager \
 	$(NULL)
 
 testsdir = @tpglibtestsdir@
@@ -323,9 +323,9 @@ distclean-local:
 
 EXTRA_DIST = \
     dbus-1/services/spurious.service \
-    telepathy/managers/spurious.manager \
-    telepathy/managers/test_manager_file.manager \
-    telepathy/managers/test_manager_file_invalid.manager \
+    telepathy-1/managers/spurious.manager \
+    telepathy-1/managers/test_manager_file.manager \
+    telepathy-1/managers/test_manager_file_invalid.manager \
     with-properties.xml \
     run-test.sh.in \
     $(NULL)
diff --git a/tests/dbus/telepathy/managers/spurious.manager b/tests/dbus/telepathy-1/managers/spurious.manager
similarity index 100%
rename from tests/dbus/telepathy/managers/spurious.manager
rename to tests/dbus/telepathy-1/managers/spurious.manager
diff --git a/tests/dbus/telepathy/managers/test_manager_file.manager b/tests/dbus/telepathy-1/managers/test_manager_file.manager
similarity index 100%
rename from tests/dbus/telepathy/managers/test_manager_file.manager
rename to tests/dbus/telepathy-1/managers/test_manager_file.manager
diff --git a/tests/dbus/telepathy/managers/test_manager_file_invalid.manager b/tests/dbus/telepathy-1/managers/test_manager_file_invalid.manager
similarity index 100%
rename from tests/dbus/telepathy/managers/test_manager_file_invalid.manager
rename to tests/dbus/telepathy-1/managers/test_manager_file_invalid.manager