[Telepathy-commits] [telepathy-spec/master] Add array-name where needed
Simon McVittie
simon.mcvittie at collabora.co.uk
Fri Mar 20 09:58:28 PDT 2009
Previously we didn't require arrays of basic types to be named, but the
new spec parser is more consistent about this.
---
spec/Channel_Interface_Messages.xml | 3 ++-
spec/Channel_Type_Streamed_Media.xml | 10 ++++++++--
spec/Channel_Type_Text.xml | 5 +++--
spec/Channel_Type_Tubes.xml | 5 +++--
spec/Connection.xml | 14 +++++++++-----
spec/Connection_Interface_Avatars.xml | 3 ++-
spec/Connection_Interface_Simple_Presence.xml | 3 ++-
spec/Connection_Manager.xml | 2 +-
spec/Properties_Interface.xml | 2 +-
9 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/spec/Channel_Interface_Messages.xml b/spec/Channel_Interface_Messages.xml
index 8cdee3c..74c88ec 100644
--- a/spec/Channel_Interface_Messages.xml
+++ b/spec/Channel_Interface_Messages.xml
@@ -706,7 +706,8 @@ USA.</p>
</tp:member>
</tp:mapping>
- <tp:simple-type type="u" name="Message_Part_Index">
+ <tp:simple-type type="u" name="Message_Part_Index"
+ array-name="Message_Part_Index_List">
<tp:added version="0.17.17"/>
<tp:docstring>
The index of a message part within a message.
diff --git a/spec/Channel_Type_Streamed_Media.xml b/spec/Channel_Type_Streamed_Media.xml
index e426542..35a3d91 100644
--- a/spec/Channel_Type_Streamed_Media.xml
+++ b/spec/Channel_Type_Streamed_Media.xml
@@ -22,7 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tp:requires interface="org.freedesktop.Telepathy.Channel"/>
<tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Group"/>
- <tp:enum name="Media_Stream_Type" type="u">
+ <tp:enum name="Media_Stream_Type" type="u"
+ array-name="Media_Stream_Type_List">
<tp:enumvalue suffix="Audio" value="0">
<tp:docstring>An audio stream</tp:docstring>
</tp:enumvalue>
@@ -86,7 +87,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
name="Pending_Send_Flags"/>
</tp:struct>
- <tp:simple-type name="Stream_ID" type="u"/>
+ <tp:simple-type name="Stream_ID" type="u"
+ array-name="Stream_ID_List">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>An unsigned integer identifying a stream within a channel.</p>
+ </tp:docstring>
+ </tp:simple-type>
<method name="ListStreams" tp:name-for-bindings="List_Streams">
<arg direction="out" type="a(uuuuuu)" tp:type="Media_Stream_Info[]"
diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml
index 5c28dce..68a31f1 100644
--- a/spec/Channel_Type_Text.xml
+++ b/spec/Channel_Type_Text.xml
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<interface name="org.freedesktop.Telepathy.Channel.Type.Text">
<tp:requires interface="org.freedesktop.Telepathy.Channel"/>
- <tp:simple-type name="Message_ID" type="u">
+ <tp:simple-type name="Message_ID" type="u" array-name="Message_ID_List">
<tp:docstring>
A unique-per-channel identifier for an incoming message. These
SHOULD be allocated in a way that minimizes collisions (in particular,
@@ -290,7 +290,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:docstring>
</signal>
- <tp:enum name="Channel_Text_Message_Type" type="u">
+ <tp:enum name="Channel_Text_Message_Type" type="u"
+ array-name="Channel_Text_Message_Type_List">
<tp:docstring>
The type of message.
</tp:docstring>
diff --git a/spec/Channel_Type_Tubes.xml b/spec/Channel_Type_Tubes.xml
index f6829b5..71c5bff 100644
--- a/spec/Channel_Type_Tubes.xml
+++ b/spec/Channel_Type_Tubes.xml
@@ -121,7 +121,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</tp:member>
</tp:struct>
- <tp:enum name="Tube_Type" type="u">
+ <tp:enum name="Tube_Type" type="u" array-name="Tube_Type_List">
<tp:enumvalue suffix="DBus" value="0">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The tube is D-Bus tube as described by the
@@ -193,7 +193,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</tp:enum>
- <tp:enum name="Socket_Access_Control" type="u">
+ <tp:enum name="Socket_Access_Control" type="u"
+ array-name="Socket_Access_Control_List">
<tp:enumvalue suffix="Localhost" value="0">
<tp:docstring>
The IP or Unix socket can be accessed by any local user (e.g.
diff --git a/spec/Connection.xml b/spec/Connection.xml
index ec0cc2e..39fb738 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -534,27 +534,31 @@ USA.</p>
</tp:enumvalue>
</tp:enum>
- <tp:simple-type name="Handle" type="u">
+ <tp:simple-type name="Handle" type="u" array-name="Handle_List">
<tp:docstring>An unsigned 32-bit integer representing a
handle</tp:docstring>
</tp:simple-type>
- <tp:simple-type name="Contact_Handle" type="u">
+ <tp:simple-type name="Contact_Handle" type="u"
+ array-name="Contact_Handle_List">
<tp:docstring>An unsigned 32-bit integer representing a handle of type
Handle_Type_Contact</tp:docstring>
</tp:simple-type>
- <tp:simple-type name="Room_Handle" type="u">
+ <tp:simple-type name="Room_Handle" type="u"
+ array-name="Room_Handle_List">
<tp:docstring>An unsigned 32-bit integer representing a handle of type
Handle_Type_Room</tp:docstring>
</tp:simple-type>
- <tp:simple-type name="List_Handle" type="u">
+ <tp:simple-type name="List_Handle" type="u"
+ array-name="List_Handle_List">
<tp:docstring>An unsigned 32-bit integer representing a handle of type
Handle_Type_List</tp:docstring>
</tp:simple-type>
- <tp:simple-type name="Group_Handle" type="u">
+ <tp:simple-type name="Group_Handle" type="u"
+ array-name="Group_Handle_List">
<tp:docstring>An unsigned 32-bit integer representing a handle of type
Handle_Type_Group</tp:docstring>
</tp:simple-type>
diff --git a/spec/Connection_Interface_Avatars.xml b/spec/Connection_Interface_Avatars.xml
index 7ef26af..1f8e38a 100644
--- a/spec/Connection_Interface_Avatars.xml
+++ b/spec/Connection_Interface_Avatars.xml
@@ -21,7 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<interface name="org.freedesktop.Telepathy.Connection.Interface.Avatars">
<tp:requires interface="org.freedesktop.Telepathy.Connection"/>
- <tp:simple-type name="Avatar_Token" type="s">
+ <tp:simple-type name="Avatar_Token" type="s"
+ array-name="Avatar_Token_List">
<tp:changed version="0.17.16">strengthened uniqueness requirements
so (CM name, protocol, token) is unique; previously only
(our Account, remote contact identifier, token) was required to be
diff --git a/spec/Connection_Interface_Simple_Presence.xml b/spec/Connection_Interface_Simple_Presence.xml
index 7acea32..8446050 100644
--- a/spec/Connection_Interface_Simple_Presence.xml
+++ b/spec/Connection_Interface_Simple_Presence.xml
@@ -349,7 +349,8 @@
</tp:enumvalue>
</tp:enum>
- <tp:enum name="Rich_Presence_Access_Control_Type" type="u">
+ <tp:enum name="Rich_Presence_Access_Control_Type" type="u"
+ array-name="Rich_Presence_Access_Control_Type_List">
<tp:docstring>
A type of access control for Rich_Presence_Access_Control.
For most types, the exact access control is given by an associated
diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index 46b56ac..ad8f058 100644
--- a/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
@@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
characters were not specified</tp:changed>
</tp:simple-type>
- <tp:simple-type name="Protocol" type="s">
+ <tp:simple-type name="Protocol" type="s" array-name="Protocol_List">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>An instant messaging protocol. It must consist only of ASCII
letters, digits and hyphen/minus signs (U+002D "-"), and must start
diff --git a/spec/Properties_Interface.xml b/spec/Properties_Interface.xml
index 91423c1..aaa4602 100644
--- a/spec/Properties_Interface.xml
+++ b/spec/Properties_Interface.xml
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tp:member type="u" name="New_Flags"/>
</tp:struct>
- <tp:simple-type name="Property_ID" type="u">
+ <tp:simple-type name="Property_ID" type="u" array-name="Property_ID_List">
<tp:docstring>
An unsigned integer used to represent a Telepathy property.
</tp:docstring>
--
1.5.6.5
More information about the telepathy-commits
mailing list