Re-namespace from im.telepathy1 to im.telepathy.v1

Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262
[depend on telepathy-glib 0.99.5 to stay in sync -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

29 files changed, 62 insertions, 62 deletions

diff --git a/.gitignore b/.gitignore
index 87d39e45..26c47457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,8 +72,8 @@ patches/
 stamp-*
 /server/mission-control-6
 /server/mission-control-6.8
-/server/im.telepathy1.AccountManager.service
-/server/im.telepathy1.MissionControl6.service
+/server/im.telepathy.v1.AccountManager.service
+/server/im.telepathy.v1.MissionControl6.service
 tags
 TAGS
 /telepathy-mission-control-[56]*
diff --git a/configure.ac b/configure.ac
index 726c754e..8ee1574d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
 PKG_CHECK_MODULES([TELEPATHY],
-  [telepathy-glib-1 >= 0.99.2.1, telepathy-glib-1-dbus >= 0.99.2.1])
+  [telepathy-glib-1 >= 0.99.5, telepathy-glib-1-dbus >= 0.99.5])
 AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0],
   [Ignore post-1.0 deprecations])
 AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0],
diff --git a/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml b/data/im.telepathy.v1.MissionControl.FromEmpathy.gschema.xml
index 80fa88f5..80fa88f5 100644
--- a/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml
+++ b/data/im.telepathy.v1.MissionControl.FromEmpathy.gschema.xml
diff --git a/mission-control-plugins/account-storage.c b/mission-control-plugins/account-storage.c
index 9ff16414..147d2d64 100644
--- a/mission-control-plugins/account-storage.c
+++ b/mission-control-plugins/account-storage.c
@@ -54,7 +54,7 @@
  *   iface->priority = 0;
  *   iface->name = "foo";
  *   iface->desc = "The FOO storage backend";
- *   iface->provider = "im.telepathy1.MissionControl6.FooStorage";
+ *   iface->provider = "im.telepathy.v1.MissionControl6.FooStorage";
  *
  *   iface->get = foo_plugin_get;
  *   iface->set = foo_plugin_get;
diff --git a/server/Makefile.am b/server/Makefile.am
index e2af72d9..45976fe0 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -10,17 +10,17 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(ERROR_CFLAGS)
 
-EXTRA_DIST = im.telepathy1.MissionControl6.service.in \
-	     im.telepathy1.AccountManager.service.in \
+EXTRA_DIST = im.telepathy.v1.MissionControl6.service.in \
+	     im.telepathy.v1.AccountManager.service.in \
 	     mission-control-6.8.in
-CLEANFILES = im.telepathy1.MissionControl6.service \
-	     im.telepathy1.AccountManager.service \
+CLEANFILES = im.telepathy.v1.MissionControl6.service \
+	     im.telepathy.v1.AccountManager.service \
 	     mission-control-6.8
 
 servicefiledir=$(prefix)/share/dbus-1/services
 servicefile_DATA= \
-	im.telepathy1.MissionControl6.service \
-	im.telepathy1.AccountManager.service \
+	im.telepathy.v1.MissionControl6.service \
+	im.telepathy.v1.AccountManager.service \
 	$(NULL)
 
 %.service: %.service.in Makefile
diff --git a/server/im.telepathy1.AccountManager.service.in b/server/im.telepathy.v1.AccountManager.service.in
index 5568ff21..74ae4071 100644
--- a/server/im.telepathy1.AccountManager.service.in
+++ b/server/im.telepathy.v1.AccountManager.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.AccountManager
+Name=im.telepathy.v1.AccountManager
 Exec=@libexecdir@/mission-control-6
diff --git a/server/im.telepathy.v1.MissionControl6.service.in b/server/im.telepathy.v1.MissionControl6.service.in
new file mode 100644
index 00000000..56c4f187
--- /dev/null
+++ b/server/im.telepathy.v1.MissionControl6.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=im.telepathy.v1.MissionControl6
+Exec=@bindir@/mc6-wait-for-name --activate im.telepathy.v1.AccountManager im.telepathy.v1.MissionControl6
diff --git a/server/im.telepathy1.MissionControl6.service.in b/server/im.telepathy1.MissionControl6.service.in
deleted file mode 100644
index 732c5e23..00000000
--- a/server/im.telepathy1.MissionControl6.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=im.telepathy1.MissionControl6
-Exec=@bindir@/mc6-wait-for-name --activate im.telepathy1.AccountManager im.telepathy1.MissionControl6
diff --git a/src/client-registry.c b/src/client-registry.c
index 690dbda3..97cf9d52 100644
--- a/src/client-registry.c
+++ b/src/client-registry.c
@@ -350,7 +350,7 @@ watch_clients (McdClientRegistry *self)
 
 #define CLIENT_MATCH_RULE \
     NAME_OWNER_RULE "," \
-    MATCH_ITEM (arg0namespace, "im.telepathy1.Client")
+    MATCH_ITEM (arg0namespace, "im.telepathy.v1.Client")
 
   if (!dbus_connection_add_filter (dconn, mcd_client_registry_name_owner_filter,
         self, NULL))
diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 66d601c5..e47c9587 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -50,7 +50,7 @@ struct _McdDispatchOperationClass
 
 #define CDO_INTERNAL_HANDLER ""
 
-#define MC_DISPATCH_OPERATION_DBUS_OBJECT_BASE "/im/telepathy1/DispatchOperation/"
+#define MC_DISPATCH_OPERATION_DBUS_OBJECT_BASE "/im/telepathy/v1/DispatchOperation/"
 
 G_GNUC_INTERNAL GType _mcd_dispatch_operation_get_type (void);
 
diff --git a/src/mcd-service.c b/src/mcd-service.c
index 37232593..4ebfb05a 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -57,7 +57,7 @@
 #include "mcd-service.h"
 
 /* DBus service specifics */
-#define MISSION_CONTROL_DBUS_SERVICE "im.telepathy1.MissionControl6"
+#define MISSION_CONTROL_DBUS_SERVICE "im.telepathy.v1.MissionControl6"
 
 static GObjectClass *parent_class = NULL;
 
diff --git a/src/request.c b/src/request.c
index 2cc633ce..257af797 100644
--- a/src/request.c
+++ b/src/request.c
@@ -103,7 +103,7 @@ G_DEFINE_TYPE_WITH_CODE (McdRequest, _mcd_request, G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
                            tp_dbus_properties_mixin_iface_init))
 
-#define REQUEST_OBJ_BASE "/im/telepathy1/ChannelDispatcher/Request"
+#define REQUEST_OBJ_BASE "/im/telepathy/v1/ChannelDispatcher/Request"
 
 static guint last_req_id = 1;
 
diff --git a/tests/twisted/account-manager/connectivity.py b/tests/twisted/account-manager/connectivity.py
index a89bd23d..1b10fb8d 100644
--- a/tests/twisted/account-manager/connectivity.py
+++ b/tests/twisted/account-manager/connectivity.py
@@ -39,7 +39,7 @@ def sync_connectivity_state(mc):
     #
     # The test-specific version of MC implements the 'BillyIdle' method, which
     # returns from a low-priority idle.
-    mc.BillyIdle(dbus_interface='im.telepathy1.MissionControl6.RegressionTests')
+    mc.BillyIdle(dbus_interface='im.telepathy.v1.MissionControl6.RegressionTests')
 
 def test(q, bus, mc):
     params = dbus.Dictionary(
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 32693d29..c0239fbd 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -22,7 +22,7 @@ Some handy constants for other tests to share and enjoy.
 
 from dbus import PROPERTIES_IFACE, INTROSPECTABLE_IFACE
 
-PREFIX = "im.telepathy1"
+PREFIX = "im.telepathy.v1"
 PATH_PREFIX = '/' + PREFIX.replace('.', '/')
 
 tp_name_prefix = PREFIX
diff --git a/tests/twisted/dbus-account-plugin.c b/tests/twisted/dbus-account-plugin.c
index 68a4f915..8924bd95 100644
--- a/tests/twisted/dbus-account-plugin.c
+++ b/tests/twisted/dbus-account-plugin.c
@@ -28,8 +28,8 @@
 
 #define DEBUG(format, ...) g_debug ("%s: " format, G_STRFUNC, ##__VA_ARGS__)
 
-#define TESTDOT "im.telepathy1.Test."
-#define TESTSLASH "/im/telepathy1/Test/"
+#define TESTDOT "im.telepathy.v1.Test."
+#define TESTSLASH "/im/telepathy/v1/Test/"
 
 #define TEST_DBUS_ACCOUNT_SERVICE       TESTDOT   "DBusAccountService"
 #define TEST_DBUS_ACCOUNT_SERVICE_PATH  TESTSLASH "DBusAccountService"
diff --git a/tests/twisted/mc-debug-server.c b/tests/twisted/mc-debug-server.c
index a911850c..9ebd585c 100644
--- a/tests/twisted/mc-debug-server.c
+++ b/tests/twisted/mc-debug-server.c
@@ -97,7 +97,7 @@ dbus_filter_function (DBusConnection *connection,
       mcd_mission_abort ((McdMission *) mcd);
     }
   else if (dbus_message_is_method_call (message,
-        "im.telepathy1.MissionControl6.RegressionTests",
+        "im.telepathy.v1.MissionControl6.RegressionTests",
         "Abort"))
     {
       DBusMessage *reply;
@@ -114,7 +114,7 @@ dbus_filter_function (DBusConnection *connection,
       return DBUS_HANDLER_RESULT_HANDLED;
     }
   else if (dbus_message_is_method_call (message,
-        "im.telepathy1.MissionControl6.RegressionTests",
+        "im.telepathy.v1.MissionControl6.RegressionTests",
         "BillyIdle"))
     {
       /* Used to drive a souped-up version of sync_dbus(), where we need to
diff --git a/tests/twisted/mctest.py b/tests/twisted/mctest.py
index 2846b34d..6dfc3e13 100644
--- a/tests/twisted/mctest.py
+++ b/tests/twisted/mctest.py
@@ -1298,13 +1298,13 @@ def tell_mc_to_die(q, bus):
     the version built for tests."""
 
     secret_debug_api = dbus.Interface(bus.get_object(cs.AM, "/"),
-        'im.telepathy1.MissionControl6.RegressionTests')
+        'im.telepathy.v1.MissionControl6.RegressionTests')
     secret_debug_api.Abort()
 
     # Make sure MC exits
     q.expect('dbus-signal', signal='NameOwnerChanged',
         predicate=(lambda e:
-            e.args[0] == 'im.telepathy1.AccountManager' and
+            e.args[0] == 'im.telepathy.v1.AccountManager' and
             e.args[2] == ''))
 
 def resuscitate_mc(q, bus, mc):
diff --git a/tests/twisted/telepathy-1/clients/AbiWord.client b/tests/twisted/telepathy-1/clients/AbiWord.client
index 7d4a2984..cd91c9f9 100644
--- a/tests/twisted/telepathy-1/clients/AbiWord.client
+++ b/tests/twisted/telepathy-1/clients/AbiWord.client
@@ -1,16 +1,16 @@
-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Handler
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Handler
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.StreamTube1
-im.telepathy1.Channel.TargetHandleType u=1
-im.telepathy1.Channel.Type.StreamTube1.Service s=x-abiword
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.StreamTube1
+im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.Type.StreamTube1.Service s=x-abiword
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 1]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.StreamTube1
-im.telepathy1.Channel.TargetHandleType u=2
-im.telepathy1.Channel.Type.StreamTube1.Service s=x-abiword
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.StreamTube1
+im.telepathy.v1.Channel.TargetHandleType u=2
+im.telepathy.v1.Channel.Type.StreamTube1.Service s=x-abiword
 
-[im.telepathy1.Client.Handler.Capabilities]
+[im.telepathy.v1.Client.Handler.Capabilities]
 com.example.Foo=true
 com.example.Bar=true
diff --git a/tests/twisted/telepathy-1/clients/Logger.client b/tests/twisted/telepathy-1/clients/Logger.client
index b8b498fe..2ec2a7db 100644
--- a/tests/twisted/telepathy-1/clients/Logger.client
+++ b/tests/twisted/telepathy-1/clients/Logger.client
@@ -1,10 +1,10 @@
-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Observer
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Observer
 
-[im.telepathy1.Client.Observer]
+[im.telepathy.v1.Client.Observer]
 Recover=true
 
-[im.telepathy1.Client.Observer.ObserverChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.RespawnObservers
-im.telepathy1.Channel.TargetHandleType u=1
+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.RespawnObservers
+im.telepathy.v1.Channel.TargetHandleType u=1
 
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 1645270d..35aff35d 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -37,14 +37,14 @@ servicedir-installed/%.conf: servicedir-installed/%.conf.in Makefile
 # We don't use the full filename for the .in because > 99 character filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
 # non-archaic tarballs)
-servicedir-uninstalled/im.telepathy1.%.service: servicedir-uninstalled/%.service.in Makefile
+servicedir-uninstalled/im.telepathy.v1.%.service: servicedir-uninstalled/%.service.in Makefile
 	$(AM_V_at)$(MKDIR_P) servicedir-uninstalled
 	$(AM_V_GEN)sed \
 		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \
 		-e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
 		$< > $@
 
-servicedir-installed/im.telepathy1.%.service: servicedir-installed/%.service.in Makefile
+servicedir-installed/im.telepathy.v1.%.service: servicedir-installed/%.service.in Makefile
 	$(AM_V_at)$(MKDIR_P) servicedir-installed
 	$(AM_V_GEN)sed \
 		-e "s|[@]mctestsdir[@]|@mctestsdir@|g" \
@@ -55,12 +55,12 @@ uninstalled_service_in_files = \
 	servicedir-uninstalled/MissionControl6.service.in \
 	servicedir-uninstalled/Client.AbiWord.service.in \
 	servicedir-uninstalled/Client.Logger.service.in
-uninstalled_service_files = $(patsubst servicedir-uninstalled/%.in,servicedir-uninstalled/im.telepathy1.%, $(uninstalled_service_in_files))
+uninstalled_service_files = $(patsubst servicedir-uninstalled/%.in,servicedir-uninstalled/im.telepathy.v1.%, $(uninstalled_service_in_files))
 installed_service_in_files = \
 	servicedir-installed/MissionControl6.service.in \
 	servicedir-installed/Client.AbiWord.service.in \
 	servicedir-installed/Client.Logger.service.in
-installed_service_files = $(patsubst servicedir-installed/%.in,servicedir-installed/im.telepathy1.%, $(installed_service_in_files))
+installed_service_files = $(patsubst servicedir-installed/%.in,servicedir-installed/im.telepathy.v1.%, $(installed_service_in_files))
 
 # D-Bus config file for testing
 uninstalled_conf_in_files = servicedir-uninstalled/tmp-session-bus.conf.in
diff --git a/tests/twisted/tools/fake-startup.sh b/tests/twisted/tools/fake-startup.sh
index 6198597e..f68b204e 100644
--- a/tests/twisted/tools/fake-startup.sh
+++ b/tests/twisted/tools/fake-startup.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 dbus-send --session --type=signal --print-reply \
-/im/telepathy1/RegressionTests \
-im.telepathy1.RegressionTests.FakeStartup \
+/im/telepathy/v1/RegressionTests \
+im.telepathy.v1.RegressionTests.FakeStartup \
 string:"$1"
diff --git a/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in b/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in
index 3bd13e5d..03023968 100644
--- a/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in
+++ b/tests/twisted/tools/servicedir-installed/Client.AbiWord.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.Client.AbiWord
-Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh im.telepathy1.Client.AbiWord
+Name=im.telepathy.v1.Client.AbiWord
+Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh im.telepathy.v1.Client.AbiWord
diff --git a/tests/twisted/tools/servicedir-installed/Client.Logger.service.in b/tests/twisted/tools/servicedir-installed/Client.Logger.service.in
index 393320c8..c9f7ed9b 100644
--- a/tests/twisted/tools/servicedir-installed/Client.Logger.service.in
+++ b/tests/twisted/tools/servicedir-installed/Client.Logger.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.Client.Logger
-Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh im.telepathy1.Client.Logger
+Name=im.telepathy.v1.Client.Logger
+Exec=/bin/sh @mctestsdir@/twisted/tools/fake-startup.sh im.telepathy.v1.Client.Logger
diff --git a/tests/twisted/tools/servicedir-installed/MissionControl6.service.in b/tests/twisted/tools/servicedir-installed/MissionControl6.service.in
index 91a7028a..826a4bb8 100644
--- a/tests/twisted/tools/servicedir-installed/MissionControl6.service.in
+++ b/tests/twisted/tools/servicedir-installed/MissionControl6.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.MissionControl6
+Name=im.telepathy.v1.MissionControl6
 Exec=@mctestsdir@/twisted/tools/run-mc.sh
diff --git a/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in b/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in
index 69ff9e62..a1344996 100644
--- a/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in
+++ b/tests/twisted/tools/servicedir-uninstalled/Client.AbiWord.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.Client.AbiWord
-Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh im.telepathy1.Client.AbiWord
+Name=im.telepathy.v1.Client.AbiWord
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh im.telepathy.v1.Client.AbiWord
diff --git a/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in b/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in
index 07ad47d5..71d8e67a 100644
--- a/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in
+++ b/tests/twisted/tools/servicedir-uninstalled/Client.Logger.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.Client.Logger
-Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh im.telepathy1.Client.Logger
+Name=im.telepathy.v1.Client.Logger
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh im.telepathy.v1.Client.Logger
diff --git a/tests/twisted/tools/servicedir-uninstalled/MissionControl6.service.in b/tests/twisted/tools/servicedir-uninstalled/MissionControl6.service.in
index ffa067a2..541cf603 100644
--- a/tests/twisted/tools/servicedir-uninstalled/MissionControl6.service.in
+++ b/tests/twisted/tools/servicedir-uninstalled/MissionControl6.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.MissionControl6
+Name=im.telepathy.v1.MissionControl6
 Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
diff --git a/util/mc6-tool.1 b/util/mc6-tool.1
index 399843cb..510b481d 100644
--- a/util/mc6-tool.1
+++ b/util/mc6-tool.1
@@ -73,7 +73,7 @@ usage depends on its first argument (the "command")
 .SS SPECIFYING ACCOUNTS
 Where an account name is needed, it may be given as a full object path
 (e.g.
-.BR /im/telepathy1/Account/gabble/jabber/example ),
+.BR /im/telepathy/v1/Account/gabble/jabber/example ),
 or as the unique account-specific suffix (e.g.
 .BR gabble/jabber/example ).
 
diff --git a/util/mc6-wait-for-name.1.in b/util/mc6-wait-for-name.1.in
index 5e0a2534..18b71d0f 100644
--- a/util/mc6-wait-for-name.1.in
+++ b/util/mc6-wait-for-name.1.in
@@ -10,8 +10,8 @@ mc6-wait-for-name \- run until a D-Bus name appears on the session bus
 .PP
 .nf
 .B [D-BUS Service]
-.BI Name= im.telepathy1.Client.Something
-.BI Exec=@bindir@/mc6-wait-for-name " im.telepathy1.Client.Something"
+.BI Name= im.telepathy.v1.Client.Something
+.BI Exec=@bindir@/mc6-wait-for-name " im.telepathy.v1.Client.Something"
 .fi
 .SH DESCRIPTION
 .B mc6-wait-for-name