diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 11:33:43 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 12:15:20 +0000 |
commit | 2a7bb6bef1e5b1abb21103d720af63c3e47cbe74 (patch) | |
tree | a117ec46bd556d0ba2cfb5c0544dc6d9b81788da /extensions/OLPC_Buddy_Info.xml | |
parent | 3b78a226708b5a5221159fadbef04cd29d48cb54 (diff) | |
download | telepathy-salut-2a7bb6bef1e5b1abb21103d720af63c3e47cbe74.tar.gz |
Update libglibcodegen from telepathy-glib master, and add libtpcodegen
This requires the imports in glib-ginterface-gen to be updated too.
Sync the entire file. It no longer needs signals-marshal.h to be
generated, so drop that.
This also introduces more strict checks for extension interfaces,
so sync the OLPC interfaces from Gabble master, and add Room_Handle to
the list of external types in all.xml.
Diffstat (limited to 'extensions/OLPC_Buddy_Info.xml')
-rw-r--r-- | extensions/OLPC_Buddy_Info.xml | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/extensions/OLPC_Buddy_Info.xml b/extensions/OLPC_Buddy_Info.xml index d7ed2ccd..7caf35c0 100644 --- a/extensions/OLPC_Buddy_Info.xml +++ b/extensions/OLPC_Buddy_Info.xml @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> <interface name="org.laptop.Telepathy.BuddyInfo"> <tp:requires interface="org.freedesktop.Telepathy.Connection"/> - <method name="SetProperties"> + <method name="SetProperties" tp:name-for-bindings="Set_Properties"> <arg direction="in" name="properties" type="a{sv}"> <tp:docstring> A dictionary mapping information names to the desired values. @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <method name="GetProperties"> + <method name="GetProperties" tp:name-for-bindings="Get_Properties"> <arg direction="in" name="contact" type="u"> <tp:docstring> An integer handle for the contact to request his properties for @@ -59,7 +59,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <signal name="PropertiesChanged"> + <signal name="PropertiesChanged" tp:name-for-bindings="Properties_Changed"> <arg name="contact" type="u"> <tp:docstring> An integer handle representing the contact @@ -67,7 +67,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </arg> <arg name="properties" type="a{sv}"> <tp:docstring> - A dictionary mapping information names to their new values + A dictionary mapping property names to their new values. All + properties are included, not just those that have changed. </tp:docstring> </arg> <tp:docstring> @@ -76,9 +77,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:docstring> </signal> - <method name="SetActivities"> - <arg direction="in" name="activities" type="a(su)"> - <tp:docstring> + + <tp:struct name="Activity" array-name="Activity_List"> + <tp:docstring>A struct containing: + <ul> + <li>the identifier of the activity</li> + <li>the room handle of the activity channel</li> + </ul> + </tp:docstring> + <tp:member type="s" name="id"/> + <tp:member type="u" tp:type="Room_Handle" name="room"/> + </tp:struct> + + <method name="SetActivities" tp:name-for-bindings="Set_Activities"> + <arg direction="in" name="activities" type="a(su)" tp:type="Activity[]"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs containing: <ul> <li>the identifier of the activity</li> @@ -95,7 +108,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <method name="AddActivity"> + <method name="AddActivity" tp:name-for-bindings="Add_Activity"> <arg direction="in" name="id" type="s"> <tp:docstring> An activity id @@ -120,14 +133,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <method name="GetActivities"> + <method name="GetActivities" tp:name-for-bindings="Get_Activities"> <arg direction="in" name="contact" type="u"> <tp:docstring> An integer handle for the contact whose activities are to be returned </tp:docstring> </arg> - <arg direction="out" name="activities" type="a(su)"> - <tp:docstring> + <arg direction="out" name="activities" type="a(su)" tp:type="Activity[]"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs containing: <ul> <li>the identifier of the activity</li> @@ -144,14 +157,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <signal name="ActivitiesChanged"> + <signal name="ActivitiesChanged" tp:name-for-bindings="Activities_Changed"> <arg name="contact" type="u"> <tp:docstring> An integer handle representing the contact </tp:docstring> </arg> - <arg name="activities" type="a(su)"> - <tp:docstring> + <arg name="activities" type="a(su)" tp:type="Activity[]"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs containing: <ul> <li>the identifier of the activity</li> @@ -165,7 +178,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:docstring> </signal> - <method name="SetCurrentActivity"> + <method name="SetCurrentActivity" + tp:name-for-bindings="Set_Current_Activity"> <arg direction="in" name="activity" type="s"> <tp:docstring> The identifier of the activity, or the empty string if there is no @@ -187,7 +201,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <method name="GetCurrentActivity"> + <method name="GetCurrentActivity" + tp:name-for-bindings="Get_Current_Activity"> <arg direction="in" name="contact" type="u"> <tp:docstring> An integer handle for the contact whose current activity is to be @@ -213,7 +228,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> </tp:possible-errors> </method> - <signal name="CurrentActivityChanged"> + <signal name="CurrentActivityChanged" + tp:name-for-bindings="Current_Activity_Changed"> <arg name="contact" type="u"> <tp:docstring> An integer handle representing the contact |