[telepathy-mission-control/master] Change MC's bus name to end with MissionControl5

[Simon McVittie]

This is a step towards having MC 4 and MC 5 parallel-installable, which
will be useful for development.
---
 .gitignore                                         |    4 ++--
 server/Makefile.am                                 |    6 +++---
 ...eedesktop.Telepathy.MissionControl5.service.in} |    2 +-
 src/mcd-service.c                                  |    4 +---
 test/twisted/account-manager/auto-away.py          |    2 +-
 test/twisted/constants.py                          |    4 ++--
 test/twisted/mc-debug-server.c                     |    2 +-
 test/twisted/servicetest.py                        |    4 ++--
 test/twisted/tools/Makefile.am                     |    2 +-
 ...ntrol.service.in => MissionControl5.service.in} |    2 +-
 10 files changed, 15 insertions(+), 17 deletions(-)
 rename server/{org.freedesktop.Telepathy.MissionControl.service.in => org.freedesktop.Telepathy.MissionControl5.service.in} (51%)
 rename test/twisted/tools/{MissionControl.service.in => MissionControl5.service.in} (61%)

diff --git a/.gitignore b/.gitignore
index a1b621f..55eb1e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,8 +65,8 @@ mission-control.pc
 patches/
 stamp-*
 server/mission-control
-server/org.freedesktop.Telepathy.AccountManager.service
-server/org.freedesktop.Telepathy.MissionControl.service
+/server/org.freedesktop.Telepathy.AccountManager.service
+/server/org.freedesktop.Telepathy.MissionControl5.service
 tags
 /telepathy-mission-control-5*
 test/mc-client
diff --git a/server/Makefile.am b/server/Makefile.am
index 71f826c..1e88965 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,13 +6,13 @@ INCLUDES = $(DBUS_CFLAGS) $(TELEPATHY_CFLAGS) -I$(top_srcdir) \
 
 if HAVE_SERVER
 
-EXTRA_DIST = org.freedesktop.Telepathy.MissionControl.service.in \
+EXTRA_DIST = org.freedesktop.Telepathy.MissionControl5.service.in \
 	     org.freedesktop.Telepathy.AccountManager.service.in
-CLEANFILES = org.freedesktop.Telepathy.MissionControl.service \
+CLEANFILES = org.freedesktop.Telepathy.MissionControl5.service \
 	     org.freedesktop.Telepathy.AccountManager.service
 
 servicefiledir=$(prefix)/share/dbus-1/services
-servicefile_DATA=org.freedesktop.Telepathy.MissionControl.service \
+servicefile_DATA=org.freedesktop.Telepathy.MissionControl5.service \
 		 org.freedesktop.Telepathy.AccountManager.service
 
 %.service: %.service.in Makefile
diff --git a/server/org.freedesktop.Telepathy.MissionControl.service.in b/server/org.freedesktop.Telepathy.MissionControl5.service.in
similarity index 51%
rename from server/org.freedesktop.Telepathy.MissionControl.service.in
rename to server/org.freedesktop.Telepathy.MissionControl5.service.in
index f27d568..1d6785e 100644
--- a/server/org.freedesktop.Telepathy.MissionControl.service.in
+++ b/server/org.freedesktop.Telepathy.MissionControl5.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.MissionControl
+Name=org.freedesktop.Telepathy.MissionControl5
 Exec=@libexecdir@/mission-control
diff --git a/src/mcd-service.c b/src/mcd-service.c
index eee382f..d4c8333 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -61,9 +61,7 @@
 #include <libmcclient/mc-errors.h>
 
 /* DBus service specifics */
-#define MISSION_CONTROL_DBUS_SERVICE "org.freedesktop.Telepathy.MissionControl"
-#define MISSION_CONTROL_DBUS_OBJECT  "/org/freedesktop/Telepathy/MissionControl"
-#define MISSION_CONTROL_DBUS_IFACE   "org.freedesktop.Telepathy.MissionControl"
+#define MISSION_CONTROL_DBUS_SERVICE "org.freedesktop.Telepathy.MissionControl5"
 
 static GObjectClass *parent_class = NULL;
 
diff --git a/test/twisted/account-manager/auto-away.py b/test/twisted/account-manager/auto-away.py
index 7b525f4..6c00ea2 100644
--- a/test/twisted/account-manager/auto-away.py
+++ b/test/twisted/account-manager/auto-away.py
@@ -115,7 +115,7 @@ def test(q, bus, mc):
 
     # This is normally a C API, only exposed to D-Bus here for testing
     secret_debug_api = dbus.Interface(bus.get_object(cs.AM, "/"),
-        'org.freedesktop.Telepathy.MissionControl.RegressionTests')
+        'org.freedesktop.Telepathy.MissionControl5.RegressionTests')
     MCD_SYSTEM_IDLE = 32
 
     # Set the idle flag
diff --git a/test/twisted/constants.py b/test/twisted/constants.py
index d8f9ac9..1b9b7dd 100644
--- a/test/twisted/constants.py
+++ b/test/twisted/constants.py
@@ -148,5 +148,5 @@ CD = tp_name_prefix + '.ChannelDispatcher'
 CD_IFACE_OP_LIST = tp_name_prefix + '.ChannelDispatcher.Interface.OperationList'
 CD_PATH = tp_path_prefix + '/ChannelDispatcher'
 
-MC = tp_name_prefix + '.MissionControl'
-MC_PATH = tp_path_prefix + '/MissionControl'
+MC = tp_name_prefix + '.MissionControl5'
+MC_PATH = tp_path_prefix + '/MissionControl5'
diff --git a/test/twisted/mc-debug-server.c b/test/twisted/mc-debug-server.c
index 6598590..fbf53e3 100644
--- a/test/twisted/mc-debug-server.c
+++ b/test/twisted/mc-debug-server.c
@@ -72,7 +72,7 @@ dbus_filter_function (DBusConnection *connection,
       mcd_mission_abort ((McdMission *) mcd);
     }
   else if (dbus_message_is_method_call (message,
-        "org.freedesktop.Telepathy.MissionControl.RegressionTests",
+        "org.freedesktop.Telepathy.MissionControl5.RegressionTests",
         "ChangeSystemFlags"))
     {
       DBusMessage *reply;
diff --git a/test/twisted/servicetest.py b/test/twisted/servicetest.py
index 7438b49..0513393 100644
--- a/test/twisted/servicetest.py
+++ b/test/twisted/servicetest.py
@@ -427,8 +427,8 @@ class ProxyWrapper:
 
 def make_mc(bus, event_func, params):
     mc = bus.get_object(
-        tp_name_prefix + '.MissionControl',
-        tp_path_prefix + '/MissionControl')
+        tp_name_prefix + '.MissionControl5',
+        tp_path_prefix + '/MissionControl5')
     assert mc is not None
 
     return mc
diff --git a/test/twisted/tools/Makefile.am b/test/twisted/tools/Makefile.am
index 9a668f2..96c6ac6 100644
--- a/test/twisted/tools/Makefile.am
+++ b/test/twisted/tools/Makefile.am
@@ -17,7 +17,7 @@ org.freedesktop.Telepathy.%.service: %.service.in
 		$< > $@
 
 # D-Bus service file for testing
-service_in_files = MissionControl.service.in Client.AbiWord.service.in
+service_in_files = MissionControl5.service.in Client.AbiWord.service.in
 service_files = $(patsubst %.in,org.freedesktop.Telepathy.%, $(service_in_files))
 
 # D-Bus config file for testing
diff --git a/test/twisted/tools/MissionControl.service.in b/test/twisted/tools/MissionControl5.service.in
similarity index 61%
rename from test/twisted/tools/MissionControl.service.in
rename to test/twisted/tools/MissionControl5.service.in
index dc33aa3..8967b3e 100644
--- a/test/twisted/tools/MissionControl.service.in
+++ b/test/twisted/tools/MissionControl5.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.MissionControl
+Name=org.freedesktop.Telepathy.MissionControl5
 Exec=@abs_top_builddir@/test/twisted/tools/exec-with-log.sh
-- 
1.5.6.5