[next] telepathy-mission-control: Re-namespace remaining o.fd. T names in the actual source code

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 27 17:37:22 2013 +0100

Re-namespace remaining o.fd.T names in the actual source code

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 mission-control-plugins/account-storage.c |    2 +-
 src/client-registry.c                     |    2 +-
 src/mcd-dispatch-operation-priv.h         |    2 +-
 src/mcd-dispatcher.c                      |    2 +-
 src/request.c                             |    2 +-
 util/mc-tool.1                            |    2 +-
 util/mc-wait-for-name.1.in                |    4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mission-control-plugins/account-storage.c b/mission-control-plugins/account-storage.c
index 159a9f4..2c6ca5e 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 = "org.freedesktop.Telepathy.MissionControl5.FooStorage";
+ *   iface->provider = "im.telepathy1.MissionControl6.FooStorage";
  *
  *   iface->get = foo_plugin_get;
  *   iface->set = foo_plugin_get;
diff --git a/src/client-registry.c b/src/client-registry.c
index 8cc987c..690dbda 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, "org.freedesktop.Telepathy.Client")
+    MATCH_ITEM (arg0namespace, "im.telepathy1.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 a61bb7b..66d601c 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 "/org/freedesktop/Telepathy/DispatchOperation/"
+#define MC_DISPATCH_OPERATION_DBUS_OBJECT_BASE "/im/telepathy1/DispatchOperation/"
 
 G_GNUC_INTERNAL GType _mcd_dispatch_operation_get_type (void);
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index f96b890..c6833bd 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1409,7 +1409,7 @@ _mcd_dispatcher_add_connection (McdDispatcher *self,
      * for it */
 }
 
-/* org.freedesktop.Telepathy.ChannelDispatcher.Messages */
+/* ChannelDispatcher.Messages */
 typedef struct
 {
     McdDispatcher *dispatcher;
diff --git a/src/request.c b/src/request.c
index ce91440..72bc6a3 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 "/org/freedesktop/Telepathy/ChannelDispatcher/Request"
+#define REQUEST_OBJ_BASE "/im/telepathy1/ChannelDispatcher/Request"
 
 static guint last_req_id = 1;
 
diff --git a/util/mc-tool.1 b/util/mc-tool.1
index badde55..1653d20 100644
--- a/util/mc-tool.1
+++ b/util/mc-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 /org/freedesktop/Telepathy/Account/gabble/jabber/example ),
+.BR /im/telepathy1/Account/gabble/jabber/example ),
 or as the unique account-specific suffix (e.g.
 .BR gabble/jabber/example ).
 
diff --git a/util/mc-wait-for-name.1.in b/util/mc-wait-for-name.1.in
index e4ce204..c233631 100644
--- a/util/mc-wait-for-name.1.in
+++ b/util/mc-wait-for-name.1.in
@@ -10,8 +10,8 @@ mc-wait-for-name \- run until a D-Bus name appears on the session bus
 .PP
 .nf
 .B [D-BUS Service]
-.BI Name= org.freedesktop.Telepathy.Client.Something
-.BI Exec=@bindir@/mc-wait-for-name " org.freedesktop.Telepathy.Client.Something"
+.BI Name= im.telepathy1.Client.Something
+.BI Exec=@bindir@/mc-wait-for-name " im.telepathy1.Client.Something"
 .fi
 .SH DESCRIPTION
 .B mc-wait-for-name