[next] telepathy-mission-control: look for clients files in telepathy-1/

[Guillaume Desmottes]

Module: telepathy-mission-control
Branch: next
Commit: c79d2f8f80c2d11bdc1e203dd5e61f8927ec7c09
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=c79d2f8f80c2d11bdc1e203dd5e61f8927ec7c09

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Oct 29 14:53:42 2013 +0100

look for clients files in telepathy-1/

---

 src/mcd-client.c                                   |    8 ++++----
 tests/twisted/Makefile.am                          |    6 +++---
 tests/twisted/run-test.sh.in                       |    2 +-
 .../clients/AbiWord.client                         |    0
 .../clients/Logger.client                          |    0
 .../{telepathy => telepathy-1}/clients/README      |    0
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mcd-client.c b/src/mcd-client.c
index c2a6427..0a232c8 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -157,8 +157,8 @@ _mcd_client_proxy_find_client_file (const gchar *client_name)
     gchar *filename, *absolute_filepath;
 
     /*
-     * The full path is $XDG_DATA_DIRS/telepathy/clients/clientname.client
-     * or $XDG_DATA_HOME/telepathy/clients/clientname.client
+     * The full path is $XDG_DATA_DIRS/telepathy-1/clients/clientname.client
+     * or $XDG_DATA_HOME/telepathy-1/clients/clientname.client
      * For testing purposes, we also look for $MC_CLIENTS_DIR/clientname.client
      * if $MC_CLIENTS_DIR is set.
      */
@@ -175,7 +175,7 @@ _mcd_client_proxy_find_client_file (const gchar *client_name)
     dirname = g_get_user_data_dir ();
     if (G_LIKELY (dirname))
     {
-        absolute_filepath = g_build_filename (dirname, "telepathy/clients",
+        absolute_filepath = g_build_filename (dirname, "telepathy-1/clients",
                                               filename, NULL);
         if (g_file_test (absolute_filepath, G_FILE_TEST_IS_REGULAR))
             goto finish;
@@ -185,7 +185,7 @@ _mcd_client_proxy_find_client_file (const gchar *client_name)
     dirs = g_get_system_data_dirs ();
     for (dirname = *dirs; dirname != NULL; dirs++, dirname = *dirs)
     {
-        absolute_filepath = g_build_filename (dirname, "telepathy/clients",
+        absolute_filepath = g_build_filename (dirname, "telepathy-1/clients",
                                               filename, NULL);
         if (g_file_test (absolute_filepath, G_FILE_TEST_IS_REGULAR))
             goto finish;
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index ad120a5..e74f5ad 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -104,9 +104,9 @@ TWISTED_OTHER_FILES = \
 	fakeconnectivity.py \
 	mctest.py \
 	servicetest.py \
-	telepathy/clients/README \
-	telepathy/clients/AbiWord.client \
-	telepathy/clients/Logger.client \
+	telepathy-1/clients/README \
+	telepathy-1/clients/AbiWord.client \
+	telepathy-1/clients/Logger.client \
 	telepathy/managers/fakecm.manager \
 	telepathy/managers/onewitheverything.manager \
 	telepathy/managers/README \
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index ce66de2..756628b 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -71,7 +71,7 @@ export MC_FILTER_PLUGIN_DIR
 XDG_CONFIG_DIRS="${test_src}/twisted"
 export XDG_CONFIG_DIRS
 
-MC_CLIENTS_DIR="${test_src}/twisted/telepathy/clients"
+MC_CLIENTS_DIR="${test_src}/twisted/telepathy-1/clients"
 export MC_CLIENTS_DIR
 MC_MANAGER_DIR="${test_src}/twisted/telepathy/managers"
 export MC_MANAGER_DIR
diff --git a/tests/twisted/telepathy/clients/AbiWord.client b/tests/twisted/telepathy-1/clients/AbiWord.client
similarity index 100%
rename from tests/twisted/telepathy/clients/AbiWord.client
rename to tests/twisted/telepathy-1/clients/AbiWord.client
diff --git a/tests/twisted/telepathy/clients/Logger.client b/tests/twisted/telepathy-1/clients/Logger.client
similarity index 100%
rename from tests/twisted/telepathy/clients/Logger.client
rename to tests/twisted/telepathy-1/clients/Logger.client
diff --git a/tests/twisted/telepathy/clients/README b/tests/twisted/telepathy-1/clients/README
similarity index 100%
rename from tests/twisted/telepathy/clients/README
rename to tests/twisted/telepathy-1/clients/README