Remove "Simple" from ex-SimplePresence types' names

The SimplePresence interface is now just Presence.

3 files changed, 16 insertions, 16 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index 81192b63..96ee11b9 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -400,7 +400,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </method>
 
     <property name="AutomaticPresence" type="(uss)" access="readwrite"
-      tp:type="Simple_Presence" tp:name-for-bindings="Automatic_Presence">
+      tp:type="Presence" tp:name-for-bindings="Automatic_Presence">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The presence status that this account should have if it is brought
           online.</p>
@@ -549,7 +549,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </property>
 
     <property name="CurrentPresence" type="(uss)" access="read"
-      tp:type="Simple_Presence" tp:name-for-bindings="Current_Presence">
+      tp:type="Presence" tp:name-for-bindings="Current_Presence">
       <tp:docstring>
         The actual presence. If the connection is not online, the
         <tp:type>Connection_Presence_Type</tp:type> SHOULD be
@@ -563,7 +563,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </property>
 
     <property name="RequestedPresence" type="(uss)" access="readwrite"
-      tp:type="Simple_Presence" tp:name-for-bindings="Requested_Presence">
+      tp:type="Presence" tp:name-for-bindings="Requested_Presence">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The requested presence for this account. When this is changed, the
         account manager should attempt to manipulate the connection manager to
diff --git a/spec/Connection_Interface_Presence.xml b/spec/Connection_Interface_Presence.xml
index a6941201..f6bfefb4 100644
--- a/spec/Connection_Interface_Presence.xml
+++ b/spec/Connection_Interface_Presence.xml
@@ -22,7 +22,7 @@
   <interface name="im.telepathy1.Connection.Interface.Presence1">
     <tp:requires interface="im.telepathy1.Connection"/>
 
-    <tp:struct name="Simple_Presence">
+    <tp:struct name="Presence">
       <tp:docstring>
         A struct representing the presence of a contact.
       </tp:docstring>
@@ -62,7 +62,7 @@
       </tp:member>
     </tp:struct>
 
-    <tp:mapping name="Simple_Contact_Presences">
+    <tp:mapping name="Contact_Presence_Map">
       <tp:docstring>
         Mapping returned by <tp:member-ref>GetPresences</tp:member-ref>
         and signalled by <tp:member-ref>PresencesChanged</tp:member-ref>,
@@ -73,14 +73,14 @@
           A contact
         </tp:docstring>
       </tp:member>
-      <tp:member type="(uss)" tp:type="Simple_Presence" name="Presence">
+      <tp:member type="(uss)" tp:type="Presence" name="Presence">
         <tp:docstring>
           The contact's presence
         </tp:docstring>
       </tp:member>
     </tp:mapping>
 
-    <tp:struct name="Simple_Status_Spec">
+    <tp:struct name="Status_Spec">
       <tp:docstring>
         A struct containing information about a status.
       </tp:docstring>
@@ -112,7 +112,7 @@
       </tp:member>
     </tp:struct>
 
-    <tp:mapping name="Simple_Status_Spec_Map">
+    <tp:mapping name="Status_Spec_Map">
       <tp:docstring>
         A mapping describing possible statuses.
       </tp:docstring>
@@ -122,7 +122,7 @@
           The string identifier of this status.
         </tp:docstring>
       </tp:member>
-      <tp:member type="(ubb)" tp:type="Simple_Status_Spec" name="Spec">
+      <tp:member type="(ubb)" tp:type="Status_Spec" name="Spec">
         <tp:docstring>
           Details of this status.
         </tp:docstring>
@@ -206,7 +206,7 @@
         </tp:docstring>
       </arg>
       <arg direction="out" name="Presence" type="a{u(uss)}"
-        tp:type="Simple_Contact_Presences">
+        tp:type="Contact_Presence_Map">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>Presence information in the same format as for the
             <tp:member-ref>PresencesChanged</tp:member-ref> signal.
@@ -240,7 +240,7 @@
     </method>
 
     <property name="Statuses" tp:name-for-bindings="Statuses" access="read"
-      type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map">
+      type="a{s(ubb)}" tp:type="Status_Spec_Map">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A dictionary where the keys are the presence statuses that are
           available on this connection, and the values are the corresponding
@@ -320,7 +320,7 @@
     </property>
 
     <signal name="PresencesChanged" tp:name-for-bindings="Presences_Changed">
-      <arg name="Presence" type="a{u(uss)}" tp:type="Simple_Contact_Presences">
+      <arg name="Presence" type="a{u(uss)}" tp:type="Contact_Presence_Map">
         <tp:docstring>
           A dictionary of contact handles mapped to the status,
           presence type and status message.
@@ -557,7 +557,7 @@
     </tp:struct>
 
     <tp:contact-attribute name="presence"
-      type="(uss)" tp:type="Simple_Presence">
+      type="(uss)" tp:type="Presence">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The same struct that would be returned by
           <tp:member-ref>GetPresences</tp:member-ref>
diff --git a/spec/Protocol_Interface_Presence.xml b/spec/Protocol_Interface_Presence.xml
index d202e808..52fe28fd 100644
--- a/spec/Protocol_Interface_Presence.xml
+++ b/spec/Protocol_Interface_Presence.xml
@@ -49,12 +49,12 @@
         <dd>If present, the user can set this status on themselves using
           <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>
+          in the <tp:type>Status_Spec</tp:type> struct.</dd>
 
         <dt>message</dt>
         <dd>If present, the user can set a non-empty message for this status;
           this corresponds to Can_Have_Message in the
-          <tp:type>Simple_Status_Spec</tp:type> struct.</dd>
+          <tp:type>Status_Spec</tp:type> struct.</dd>
       </dl>
 
       <p>Unrecognised tokens MUST be ignored.</p>
@@ -96,7 +96,7 @@ status-chat=2 settable message
 
     <property name="Statuses"
       tp:name-for-bindings="Statuses"
-      type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map" access="read">
+      type="a{s(ubb)}" tp:type="Status_Spec_Map" access="read">
       <tp:docstring>
         <p>The statuses that might appear in the <tp:dbus-ref
           namespace="im.telepathy1"