diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-09 15:08:53 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-09 15:08:53 +0100 |
commit | d6685f75cb1ca7ae2868a404bb13b721328432d7 (patch) | |
tree | c4c10e65c571521475accb88323bab056ff910fc | |
parent | 9f83605638e5dbb6114535db5556f431f0384331 (diff) |
Add tp:name-for-bindings to remaining methods, signals, properties
-rw-r--r-- | spec/Account.xml | 25 | ||||
-rw-r--r-- | spec/Account_Manager.xml | 3 | ||||
-rw-r--r-- | spec/Channel.xml | 11 | ||||
-rw-r--r-- | spec/Channel_Bundle.xml | 4 | ||||
-rw-r--r-- | spec/Channel_Future.xml | 6 | ||||
-rw-r--r-- | spec/Channel_Interface_Call_Merging.xml | 4 | ||||
-rw-r--r-- | spec/Channel_Interface_Group.xml | 3 | ||||
-rw-r--r-- | spec/Channel_Type_Room_List.xml | 3 | ||||
-rw-r--r-- | spec/Channel_Type_Text.xml | 6 | ||||
-rw-r--r-- | spec/Connection.xml | 8 | ||||
-rw-r--r-- | spec/Connection_Interface_Aliasing.xml | 2 | ||||
-rw-r--r-- | spec/Connection_Interface_Renaming.xml | 2 | ||||
-rw-r--r-- | spec/Connection_Interface_Requests.xml | 4 | ||||
-rw-r--r-- | spec/Connection_Interface_Simple_Presence.xml | 2 | ||||
-rw-r--r-- | spec/Connection_Manager.xml | 3 | ||||
-rw-r--r-- | spec/Media_Session_Handler.xml | 4 | ||||
-rw-r--r-- | spec/Media_Stream_Handler.xml | 6 |
17 files changed, 55 insertions, 41 deletions
diff --git a/spec/Account.xml b/spec/Account.xml index a274bc2b..4c32498e 100644 --- a/spec/Account.xml +++ b/spec/Account.xml @@ -104,20 +104,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. are the ones given special status by the source, and we have all of them --> - <property name="Interfaces" type="as" access="read"> + <property name="Interfaces" tp:name-for-bindings="Interfaces" + type="as" tp:type="DBus_Interface[]" access="read"> <tp:docstring> A list of the extra interfaces provided by this account. </tp:docstring> </property> - <method name="Remove"> + <method name="Remove" tp:name-for-bindings="Remove"> <tp:docstring>Delete the account.</tp:docstring> <tp:possible-errors> <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> </tp:possible-errors> </method> - <signal name="Removed"> + <signal name="Removed" tp:name-for-bindings="Removed"> <tp:docstring> This account has been removed. @@ -163,7 +164,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Icon" type="s" access="readwrite"> + <property name="Icon" tp:name-for-bindings="Icon" + type="s" access="readwrite"> <tp:docstring> The name of an icon in the system's icon theme, such as "im-msn", or the empty string to not specify an icon. If the icon is set to @@ -179,7 +181,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Valid" type="b" access="read"> + <property name="Valid" tp:name-for-bindings="Valid" + type="b" access="read"> <tp:docstring> If true, this account is considered by the account manager to be complete and usable. If false, user action is required to make it @@ -198,7 +201,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Enabled" type="b" access="readwrite"> + <property name="Enabled" tp:name-for-bindings="Enabled" + type="b" access="readwrite"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This property gives the users the possibility to prevent an account from being used. This flag does not change the validity of the @@ -231,7 +235,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Nickname" type="as" access="readwrite"> + <property name="Nickname" tp:name-for-bindings="Nickname" + type="as" access="readwrite"> <tp:docstring> The nickname to set on this account for display to other contacts, as set by the user. When the account becomes connected, the @@ -249,7 +254,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Parameters" type="a{sv}" access="read"> + <property name="Parameters" tp:name-for-bindings="Parameters" + type="a{sv}" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from connection manager parameter names (as in the ConnectionManager interface) to their values. This property includes @@ -339,7 +345,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Connection" type="s" access="read"> + <property name="Connection" tp:name-for-bindings="Connection" + type="s" access="read"> <tp:docstring> Either the well-known bus name of the connection to this account, or the empty string if there is no connection. diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml index 867c0c00..b92913e2 100644 --- a/spec/Account_Manager.xml +++ b/spec/Account_Manager.xml @@ -52,7 +52,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * register filters (completely out of scope: Channel Dispatcher again) --> - <property name="Interfaces" type="as" access="read"> + <property name="Interfaces" tp:name-for-bindings="Interfaces" + type="as" tp:type="DBus_Interface[]" access="read"> <tp:docstring> A list of the interfaces provided by the account manager object. </tp:docstring> diff --git a/spec/Channel.xml b/spec/Channel.xml index c91cd4e7..545e84c7 100644 --- a/spec/Channel.xml +++ b/spec/Channel.xml @@ -46,8 +46,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </property> - <property name="Interfaces" type="as" tp:type="DBus_Interface[]" - access="read"> + <property name="Interfaces" tp:name-for-bindings="Interfaces" + type="as" tp:type="DBus_Interface[]" access="read"> <tp:added version="0.17.7"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Extra interfaces provided by this channel. This SHOULD NOT include @@ -113,7 +113,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </property> - <property name="TargetID" type="s" access="read"> + <property name="TargetID" tp:name-for-bindings="Target_ID" + type="s" access="read"> <tp:added version="0.17.9"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -174,7 +175,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </property> - <method name="Close"> + <method name="Close" tp:name-for-bindings="Close"> <tp:docstring> Request that the channel be closed. This is not the case until the Closed signal has been emitted, and depending on the connection @@ -199,7 +200,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:possible-errors> </method> - <signal name="Closed"> + <signal name="Closed" tp:name-for-bindings="Closed"> <tp:docstring> Emitted when the channel has been closed. Method calls on the channel are no longer valid after this signal has been emitted, diff --git a/spec/Channel_Bundle.xml b/spec/Channel_Bundle.xml index 0b1a6c13..d211525a 100644 --- a/spec/Channel_Bundle.xml +++ b/spec/Channel_Bundle.xml @@ -36,8 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. exist, the bundle <em>B</em> will also exist.</p> </tp:docstring> - <property name="Interfaces" type="as" access="read" - tp:type="DBus_Interface[]"> + <property name="Interfaces" tp:name-for-bindings="Interfaces" + type="as" access="read" tp:type="DBus_Interface[]"> <tp:docstring> A list of the extra interfaces provided by this channel bundle. </tp:docstring> diff --git a/spec/Channel_Future.xml b/spec/Channel_Future.xml index d34b9c4e..7e907020 100644 --- a/spec/Channel_Future.xml +++ b/spec/Channel_Future.xml @@ -42,7 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> - <property name="Requested" type="b" access="read"> + <property name="Requested" tp:name-for-bindings="Requested" + type="b" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>True if this channel was created in response to a call to <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref>, @@ -163,7 +164,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </property> - <property name="Bundle" type="o" access="read"> + <property name="Bundle" tp:name-for-bindings="Bundle" + type="o" access="read"> <tp:added version="0.17.9">(in Channel.FUTURE pseudo-interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Channel_Interface_Call_Merging.xml b/spec/Channel_Interface_Call_Merging.xml index 23f95585..a98daf12 100644 --- a/spec/Channel_Interface_Call_Merging.xml +++ b/spec/Channel_Interface_Call_Merging.xml @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. in the same sort of way as in GSM or PBX telephony.</p> </tp:docstring> - <method name="Merge"> + <method name="Merge" tp:name-for-bindings="Merge"> <arg direction="in" type="o" name="Other"> <tp:docstring> The other channel to merge into this one @@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:possible-errors> </method> - <method name="Split"> + <method name="Split" tp:name-for-bindings="Split"> <arg direction="in" name="Contact" type="u" tp:type="Contact_Handle"> <tp:docstring> The handle of the contact to split off a conversation with, who diff --git a/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group.xml index b81a86bd..4e69b88d 100644 --- a/spec/Channel_Interface_Group.xml +++ b/spec/Channel_Interface_Group.xml @@ -411,7 +411,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ from that to the deprecated GetAllMembers method.</tp:added> </property> - <property name="Members" access="read" type="au" tp:type="Contact_Handle[]"> + <property name="Members" tp:name-for-bindings="Members" + access="read" type="au" tp:type="Contact_Handle[]"> <tp:docstring> The members of this channel. </tp:docstring> diff --git a/spec/Channel_Type_Room_List.xml b/spec/Channel_Type_Room_List.xml index e98651d7..6636ce0d 100644 --- a/spec/Channel_Type_Room_List.xml +++ b/spec/Channel_Type_Room_List.xml @@ -27,7 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member type="a{sv}" tp:type="String_Variant_Map" name="Info"/> </tp:struct> - <property name="Server" type="s" access="read"> + <property name="Server" tp:name-for-bindings="Server" + type="s" access="read"> <tp:docstring> <p>For protocols with a concept of chatrooms on multiple servers with different DNS names (like XMPP), the DNS name of the server diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml index e9a40e4c..205dbc0b 100644 --- a/spec/Channel_Type_Text.xml +++ b/spec/Channel_Type_Text.xml @@ -117,7 +117,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </signal> - <signal name="Received"> + <signal name="Received" tp:name-for-bindings="Received"> <arg name="ID" type="u"> <tp:docstring> A numeric identifier for acknowledging the message @@ -157,7 +157,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </signal> - <method name="Send"> + <method name="Send" tp:name-for-bindings="Send"> <arg direction="in" name="Type" type="u" tp:type="Channel_Text_Message_Type"> <tp:docstring> An integer indicating the type of the message @@ -251,7 +251,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ actually implemented.</tp:changed> </signal> - <signal name="Sent"> + <signal name="Sent" tp:name-for-bindings="Sent"> <arg name="Timestamp" type="u" tp:type="Unix_Timestamp"> <tp:docstring> Unix timestamp indicating when the message was sent diff --git a/spec/Connection.xml b/spec/Connection.xml index 2afc478b..f543a16a 100644 --- a/spec/Connection.xml +++ b/spec/Connection.xml @@ -44,7 +44,7 @@ USA.</p> </tp:member> </tp:struct> - <method name="Connect"> + <method name="Connect" tp:name-for-bindings="Connect"> <tp:docstring> Request that the connection be established. This will be done asynchronously and errors will be returned by emitting StatusChanged @@ -58,7 +58,7 @@ USA.</p> </tp:possible-errors> </method> - <method name="Disconnect"> + <method name="Disconnect" tp:name-for-bindings="Disconnect"> <tp:docstring> Request that the connection be closed. This closes the connection if it's not already in DISCONNECTED state, and destroys the connection @@ -139,8 +139,8 @@ USA.</p> </arg> </signal> - <property name="SelfHandle" type="u" tp:type="Contact_Handle" - access="read"> + <property name="SelfHandle" tp:name-for-bindings="Self_Handle" + type="u" tp:type="Contact_Handle" access="read"> <tp:docstring> The handle which represents the user on this connection, which will remain valid for the lifetime of this connection, or until a change diff --git a/spec/Connection_Interface_Aliasing.xml b/spec/Connection_Interface_Aliasing.xml index 5822d35d..ee14fa70 100644 --- a/spec/Connection_Interface_Aliasing.xml +++ b/spec/Connection_Interface_Aliasing.xml @@ -126,7 +126,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> </tp:possible-errors> </method> - <method name="SetAliases"> + <method name="SetAliases" tp:name-for-bindings="Set_Aliases"> <arg direction="in" name="Aliases" type="a{us}" tp:type="Alias_Map"> <tp:docstring> A dictionary mapping integer handles of contacts diff --git a/spec/Connection_Interface_Renaming.xml b/spec/Connection_Interface_Renaming.xml index 84012884..99811846 100644 --- a/spec/Connection_Interface_Renaming.xml +++ b/spec/Connection_Interface_Renaming.xml @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <interface name="org.freedesktop.Telepathy.Connection.Interface.Renaming" tp:causes-havoc='not well-tested'> <tp:requires interface="org.freedesktop.Telepathy.Connection"/> - <signal name="Renamed"> + <signal name="Renamed" tp:name-for-bindings="Renamed"> <arg name="Original" type="u" tp:type="Contact_Handle"> <tp:docstring> The handle of the original identifier diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml index 8827faf5..932c4a69 100644 --- a/spec/Connection_Interface_Requests.xml +++ b/spec/Connection_Interface_Requests.xml @@ -230,8 +230,8 @@ </arg> </signal> - <property name="Channels" type="a(oa{sv})" access="read" - tp:type="Channel_Details[]"> + <property name="Channels" tp:name-for-bindings="Channels" + type="a(oa{sv})" access="read" tp:type="Channel_Details[]"> <tp:docstring> A list of all the channels which currently exist on this connection. Change notification is via the diff --git a/spec/Connection_Interface_Simple_Presence.xml b/spec/Connection_Interface_Simple_Presence.xml index 26ec63f2..92614e0a 100644 --- a/spec/Connection_Interface_Simple_Presence.xml +++ b/spec/Connection_Interface_Simple_Presence.xml @@ -228,7 +228,7 @@ </tp:possible-errors> </method> - <property name="Statuses" access="read" + <property name="Statuses" tp:name-for-bindings="Statuses" access="read" type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary where the keys are the presence statuses that the user diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml index 9521b15e..e3cfa8d3 100644 --- a/spec/Connection_Manager.xml +++ b/spec/Connection_Manager.xml @@ -297,7 +297,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:possible-errors> </method> - <property name="Interfaces" type="as" access="read"> + <property name="Interfaces" tp:name-for-bindings="Interfaces" + type="as" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of the extra interfaces provided by this connection manager (i.e. extra functionality that can be provided even before a diff --git a/spec/Media_Session_Handler.xml b/spec/Media_Session_Handler.xml index f4dcf929..a6cf5192 100644 --- a/spec/Media_Session_Handler.xml +++ b/spec/Media_Session_Handler.xml @@ -19,7 +19,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> <interface name="org.freedesktop.Telepathy.Media.SessionHandler"> - <method name="Error"> + <method name="Error" tp:name-for-bindings="Error"> <arg direction="in" name="Error_Code" type="u" tp:type="Media_Stream_Error"/> <arg direction="in" name="Message" type="s"/> @@ -60,7 +60,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ session. </tp:docstring> </signal> - <method name="Ready"> + <method name="Ready" tp:name-for-bindings="Ready"> <tp:docstring> Inform the connection manager that a client is ready to handle this session handler (i.e. that it has connected to the diff --git a/spec/Media_Stream_Handler.xml b/spec/Media_Stream_Handler.xml index 1d45f9e2..e4764797 100644 --- a/spec/Media_Stream_Handler.xml +++ b/spec/Media_Stream_Handler.xml @@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ client of a new remote candidate. </tp:docstring> </signal> - <signal name="Close"> + <signal name="Close" tp:name-for-bindings="Close"> <tp:docstring> Signal emitted when the connection manager wishes the stream to be closed. @@ -83,7 +83,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ Inform the connection manager of the current codec choice. </tp:docstring> </method> - <method name="Error"> + <method name="Error" tp:name-for-bindings="Error"> <arg direction="in" name="Error_Code" type="u" tp:type="Media_Stream_Error"> <tp:docstring> ID of error, from the MediaStreamError enumeration @@ -184,7 +184,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </tp:enumvalue> </tp:enum> - <method name="Ready"> + <method name="Ready" tp:name-for-bindings="Ready"> <arg direction="in" name="Codecs" type="a(usuuua{ss})" tp:type="Media_Stream_Handler_Codec[]"> <tp:docstring> |