SimplePresence: rename to Presence

It's not so simple anymore, clearly.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

9 files changed, 17 insertions, 17 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index ffa90c98..24f79436 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -555,7 +555,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:type>Connection_Presence_Type</tp:type> SHOULD be
         Connection_Presence_Type_Offline.
         If the connection is online but does not support the <tp:dbus-ref
-        namespace="im.telepathy1.Connection.Interface">SimplePresence1</tp:dbus-ref>
+        namespace="im.telepathy1.Connection.Interface">Presence1</tp:dbus-ref>
         interface, the type SHOULD be Connection_Presence_Type_Unset.
         The account manager is expected to set this by observing signals
         from the Connection.
diff --git a/spec/Connection.xml b/spec/Connection.xml
index 2a1d626a..423985df 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -61,7 +61,7 @@ USA.</p>
         <tp:rationale>
           <p>In some connection managers, certain capabilities of a connection
             are known to be implemented for all connections (e.g. support
-            for SimplePresence), and some interfaces (like SimplePresence) can
+            for Presence), and some interfaces (like Presence) can
             even be used before connecting. Other capabilities may
             or may not exist, depending on server functionality; by the time
             the connection goes CONNECTED, the connection manager is expected
@@ -967,12 +967,12 @@ USA.</p>
 
     <p>As well as the methods and signatures below, arbitrary interfaces may be
     provided by the Connection object to represent extra connection-wide
-    functionality, such as the Connection.Interface.SimplePresence for
+    functionality, such as the Connection.Interface.Presence for
     receiving and
     reporting presence information, and Connection.Interface.Aliasing for
     connections where contacts may set and change an alias for themselves.
     These interfaces can be discovered using the
-    <tp:member-ref>GetInterfaces</tp:member-ref> method.</p>
+    <tp:member-ref>Interfaces</tp:member-ref> property.</p>
 
     <p>Contacts, rooms, and server-stored lists (such as subscribed contacts,
     block lists, or allow lists) on a service are all represented by
diff --git a/spec/Connection_Interface_Client_Types.xml b/spec/Connection_Interface_Client_Types.xml
index 07c4af9d..c08d8c15 100644
--- a/spec/Connection_Interface_Client_Types.xml
+++ b/spec/Connection_Interface_Client_Types.xml
@@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         client types of the most available resource will be returned. In
         other words, the returned client types are those for the resource whose
         presence will be retreived using the
-        <tp:dbus-ref namespace="imt1.Connection.Interface">SimplePresence1</tp:dbus-ref>
+        <tp:dbus-ref namespace="imt1.Connection.Interface">Presence1</tp:dbus-ref>
         interface.</p>
 
       <p>For example, if a contact has two resources:</p>
diff --git a/spec/Connection_Interface_Communication_Policy.xml b/spec/Connection_Interface_Communication_Policy.xml
index 0fdfcd4c..e9797ab5 100644
--- a/spec/Connection_Interface_Communication_Policy.xml
+++ b/spec/Connection_Interface_Communication_Policy.xml
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      name="im.telepathy1.Connection.Interface.CommunicationPolicy1"
      tp:causes-havoc="experimental">
     <tp:added version="0.21.1">(draft 1)</tp:added>
-    <tp:requires interface="im.telepathy1.Connection.Interface.SimplePresence1"/>
+    <tp:requires interface="im.telepathy1.Connection.Interface.Presence1"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>
diff --git a/spec/Connection_Interface_Contact_List.xml b/spec/Connection_Interface_Contact_List.xml
index cef79d59..901615d7 100644
--- a/spec/Connection_Interface_Contact_List.xml
+++ b/spec/Connection_Interface_Contact_List.xml
@@ -267,7 +267,7 @@
         <p>If this attribute is not Yes, the local user cannot generally
           expect to receive presence from this contact. Their presence status
           as returned by <tp:dbus-ref
-            namespace="im.telepathy1.Connection.Interface.SimplePresence1">GetPresences</tp:dbus-ref>
+            namespace="im.telepathy1.Connection.Interface.Presence1">GetPresences</tp:dbus-ref>
           is likely to be (Unknown, "unknown", ""), unless the local user
           can temporarily see their presence for some other reason (for
           instance, on XMPP, contacts seen in chatrooms will temporarily
diff --git a/spec/Connection_Interface_Simple_Presence.xml b/spec/Connection_Interface_Presence.xml
index 236dcb61..a6941201 100644
--- a/spec/Connection_Interface_Simple_Presence.xml
+++ b/spec/Connection_Interface_Presence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Simple_Presence" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Presence" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2005-2008 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2005, 2006 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
@@ -19,7 +19,7 @@
       Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="im.telepathy1.Connection.Interface.SimplePresence1">
+  <interface name="im.telepathy1.Connection.Interface.Presence1">
     <tp:requires interface="im.telepathy1.Connection"/>
 
     <tp:struct name="Simple_Presence">
@@ -507,7 +507,7 @@
     <tp:struct name="Access_Control">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>An access control mode for extended presence items like geolocation.
-          This type isn't actually used by the SimplePresence interface, but
+          This type isn't actually used by the Presence interface, but
           it's included here so it can be referenced by rich presence
           interfaces.</p>
 
@@ -532,7 +532,7 @@
     <tp:struct name="Rich_Presence_Access_Control">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>An access control mode for extended presence items like geolocation.
-          This type isn't actually used by the SimplePresence interface, but
+          This type isn't actually used by the Presence interface, but
           it's included here so it can be referenced by rich presence interfaces
           such as <tp:dbus-ref
                      namespace="im.telepathy1.Connection.Interface">Location1</tp:dbus-ref>.</p>
@@ -562,7 +562,7 @@
         <p>The same struct that would be returned by
           <tp:member-ref>GetPresences</tp:member-ref>
           (always present with some value if information from the
-          SimplePresence interface was requested)</p>
+          Presence interface was requested)</p>
       </tp:docstring>
     </tp:contact-attribute>
 
diff --git a/spec/Connection_Interface_Resources.xml b/spec/Connection_Interface_Resources.xml
index 98c4fb2a..0f39ba2e 100644
--- a/spec/Connection_Interface_Resources.xml
+++ b/spec/Connection_Interface_Resources.xml
@@ -52,7 +52,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         below:</p>
 
       <ul>
-        <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">SimplePresence1/presence</tp:dbus-ref></li>
+        <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Presence1/presence</tp:dbus-ref></li>
         <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">ContactCapabilities1/capabilities</tp:dbus-ref></li>
         <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">ClientTypes1/client-types</tp:dbus-ref></li>
       </ul>
diff --git a/spec/Protocol_Interface_Presence.xml b/spec/Protocol_Interface_Presence.xml
index 97dac260..d202e808 100644
--- a/spec/Protocol_Interface_Presence.xml
+++ b/spec/Protocol_Interface_Presence.xml
@@ -47,7 +47,7 @@
       <dl>
         <dt>settable</dt>
         <dd>If present, the user can set this status on themselves using
-          <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.SimplePresence1"
+          <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Presence1"
             >SetPresence</tp:dbus-ref>; this corresponds to May_Set_On_Self
           in the <tp:type>Simple_Status_Spec</tp:type> struct.</dd>
 
@@ -100,9 +100,9 @@ status-chat=2 settable message
       <tp:docstring>
         <p>The statuses that might appear in the <tp:dbus-ref
           namespace="im.telepathy1"
-          >Connection.Interface.SimplePresence1.Statuses</tp:dbus-ref>
+          >Connection.Interface.Presence1.Statuses</tp:dbus-ref>
           property on a connection to this protocol that supports
-          SimplePresence. This property is immutable.</p>
+          Presence. This property is immutable.</p>
 
         <p>Depending on server capabilities, it is possible that not all
           of these will actually appear on the Connection.</p>
diff --git a/spec/all.xml b/spec/all.xml
index b515f992..888c0ff1 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -85,7 +85,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Connection_Interface_Location.xml"/>
    <xi:include href="Connection_Interface_Renaming.xml"/>
    <xi:include href="Connection_Interface_Resources.xml"/>
-   <xi:include href="Connection_Interface_Simple_Presence.xml"/>
+   <xi:include href="Connection_Interface_Presence.xml"/>
   </tp:section>
 
   <tp:section name="Connection feature interfaces">