Version object paths as well as bus names

Rationale: http://0pointer.de/blog/projects/versioning-dbus.html

8 files changed, 9 insertions, 9 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index 96ee11b9..79d0e19c 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       <p>Accounts are uniquely identified by object path. The object path
         of an Account MUST take the form
-        <code>/im/telepathy/Account/<em>cm</em>/<em>proto</em>/<em>acct</em></code>, where:</p>
+        <code>/im/telepathy1/Account/<em>cm</em>/<em>proto</em>/<em>acct</em></code>, where:</p>
 
       <ul>
         <li><em>cm</em> is the same <tp:type>Connection_Manager_Name</tp:type>
diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml
index 22f20ff3..566ec43c 100644
--- a/spec/Account_Manager.xml
+++ b/spec/Account_Manager.xml
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       <p>The current account manager is defined to be the process that owns
         the well-known bus name <tt>im.telepathy1.AccountManager</tt> on
         the session bus. This process must export an
-        <tt>/im/telepathy/AccountManager</tt> object with the
+        <tt>/im/telepathy1/AccountManager</tt> object with the
         AccountManager interface.</p>
     </tp:docstring>
     <tp:added version="0.17.2"/>
diff --git a/spec/Channel_Dispatcher.xml b/spec/Channel_Dispatcher.xml
index 595d385b..bd4825ba 100644
--- a/spec/Channel_Dispatcher.xml
+++ b/spec/Channel_Dispatcher.xml
@@ -51,7 +51,7 @@
         <code>im.telepathy1.ChannelDispatcher</code> on
         the session bus. This process MUST export an object with this
         interface at the object path
-        <code>/im/telepathy/ChannelDispatcher</code>.</p>
+        <code>/im/telepathy1/ChannelDispatcher</code>.</p>
 
       <p>Until a mechanism exists for making a reasonable automatic choice
         of ChannelDispatcher implementation, implementations SHOULD NOT
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index c406d0c3..96900618 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -162,7 +162,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       <blockquote>
         <pre>
 <tp:dbus-ref namespace="imt1.Connection.Interface.Requests">NewChannels</tp:dbus-ref>([
-  /im/telepathy/Connection/foo/bar/foo_40bar_2ecom/CallChannel,
+  /im/telepathy1/Connection/foo/bar/foo_40bar_2ecom/CallChannel,
   {
     ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref
       namespace="imt1.Channel.Type">Call1</tp:dbus-ref>,
diff --git a/spec/Connection.xml b/spec/Connection.xml
index 5d2b0194..d245309c 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -756,7 +756,7 @@ USA.</p>
 
       <p>In order to allow Connection objects to be discovered by new clients,
         the object path and well-known bus name MUST be of the form
-        <code>/im/telepathy/Connection/cmname/proto/account</code>
+        <code>/im/telepathy1/Connection/cmname/proto/account</code>
         and
         <code>im.telepathy1.Connection.cmname.proto.account</code>
         where:</p>
diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index 1210c8f6..31338551 100644
--- a/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
@@ -464,7 +464,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
     <p>When the connection manager is running, it must have an object
       implementing the ConnectionManager interface at the object path
-      <code>/im/telepathy/ConnectionManager/<em>cmname</em></code>.
+      <code>/im/telepathy1/ConnectionManager/<em>cmname</em></code>.
     </p>
 
     <p>Connection managers' capabilities can be determined dynamically by
diff --git a/spec/Debug.xml b/spec/Debug.xml
index e6162595..d2449d46 100644
--- a/spec/Debug.xml
+++ b/spec/Debug.xml
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <p>An interface for providing debug messages.</p>
 
       <p>This interface is primarily provided by one object per
-      service, at the path <tt>/im/telepathy/debug</tt>.</p>
+      service, at the path <tt>/im/telepathy1/debug</tt>.</p>
     </tp:docstring>
 
     <property name="Enabled" type="b" access="readwrite"
diff --git a/spec/Protocol.xml b/spec/Protocol.xml
index 315c1070..9dedee9f 100644
--- a/spec/Protocol.xml
+++ b/spec/Protocol.xml
@@ -40,9 +40,9 @@
           in Account object paths, and in Connection object paths and bus
           names. For instance, telepathy-gabble and telepathy-salut would
           implement objects at
-          <code>/im/telepathy/ConnectionManager/gabble/jabber</code>
+          <code>/im/telepathy1/ConnectionManager/gabble/jabber</code>
           and
-          <code>/im/telepathy/ConnectionManager/salut/local_xmpp</code>,
+          <code>/im/telepathy1/ConnectionManager/salut/local_xmpp</code>,
           respectively.</p>
       </tp:rationale>