[Telepathy-commits] [telepathy-glib/master] Update spec/Channel_Type_Tubes.xml from spec git master to fix code generation

[Simon McVittie]

Now that we're using tp:name-for-bindings, we need this version of
the Tubes spec in order to preserve telepathy-glib's ABI.
---
 spec/Channel_Type_Tubes.xml |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/spec/Channel_Type_Tubes.xml b/spec/Channel_Type_Tubes.xml
index f28f9b6..bb55c48 100644
--- a/spec/Channel_Type_Tubes.xml
+++ b/spec/Channel_Type_Tubes.xml
@@ -56,11 +56,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </tp:struct>
 
     <tp:struct name="DBus_Tube_Member" array-name="DBus_Tube_Member_List">
-      <tp:docstring>A struct (handle, unique name) representing a participant
-        in a D-Bus tube, as returned by GetDBusNames on the Tubes channel
-        type, and as seen in the DBusNamesChanged signal.</tp:docstring>
-      <tp:member type="u" tp:type="Contact_Handle" name="Handle"/>
-      <tp:member type="s" tp:type="DBus_Unique_Name" name="Unique_Name"/>
+      <tp:docstring>Represents a participant in a multi-user D-Bus tube, as
+        returned by <tp:member-ref>GetDBusNames</tp:member-ref> and seen in the
+        <tp:member-ref>DBusNamesChanged</tp:member-ref> signal.</tp:docstring>
+      <tp:member type="u" tp:type="Contact_Handle" name="Handle">
+        <tp:docstring>
+          The handle of a participant in this D-Bus tube.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="s" tp:type="DBus_Unique_Name" name="Unique_Name">
+        <tp:docstring>
+          That participant's unique name.
+        </tp:docstring>
+      </tp:member>
     </tp:struct>
 
     <tp:struct name="Socket_Address_IPv4">
@@ -298,7 +306,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </method>
 
-    <method name="OfferDBusTube" tp:name-for-bindings="Offer_DBus_Tube">
+    <!-- this tp:name-for-bindings is ugly, but compatible with
+    the code generation in telepathy-glib versions that did not use
+    tp:name-for-bindings -->
+    <method name="OfferDBusTube" tp:name-for-bindings="Offer_D_Bus_Tube">
       <tp:docstring>
         Offers a D-Bus tube providing the service specified.
       </tp:docstring>
@@ -450,7 +461,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
-    <method name="AcceptDBusTube" tp:name-for-bindings="Accept_DBus_Tube">
+    <!-- this tp:name-for-bindings is ugly, but compatible with
+    the code generation in telepathy-glib versions that did not use
+    tp:name-for-bindings -->
+    <method name="AcceptDBusTube" tp:name-for-bindings="Accept_D_Bus_Tube">
       <tp:docstring>
         Accept a D-Bus tube that's in the "local pending" state. The
         connection manager will attempt to open the tube. The tube remains in
@@ -572,8 +586,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
+    <!-- this tp:name-for-bindings is ugly, but compatible with
+    the code generation in telepathy-glib versions that did not use
+    tp:name-for-bindings -->
     <method name="GetDBusTubeAddress"
-      tp:name-for-bindings="Get_DBus_Tube_Address">
+      tp:name-for-bindings="Get_D_Bus_Tube_Address">
       <tp:docstring>
         For a D-Bus tube, return a string describing the address of the
         private bus.
@@ -602,7 +619,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <method name="GetDBusNames" tp:name-for-bindings="Get_DBus_Names">
+    <!-- this tp:name-for-bindings is ugly, but compatible with
+    the code generation in telepathy-glib versions that did not use
+    tp:name-for-bindings -->
+    <method name="GetDBusNames" tp:name-for-bindings="Get_D_Bus_Names">
       <tp:docstring>
         For a multi-user (i.e. Handle_Type_Room) D-Bus tube, obtain a mapping
         between contact handles and their unique bus names on this tube.
@@ -632,7 +652,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <signal name="DBusNamesChanged" tp:name-for-bindings="DBus_Names_Changed">
+    <!-- this tp:name-for-bindings is ugly, but compatible with
+    the code generation in telepathy-glib versions that did not use
+    tp:name-for-bindings -->
+    <signal name="DBusNamesChanged" tp:name-for-bindings="D_Bus_Names_Changed">
       <tp:docstring>
         Emitted on a multi-user (i.e. Handle_Type_Room) D-Bus tube when a
         participant opens or closes the tube.
-- 
1.5.6.5