[Telepathy-commits] [telepathy-spec/master] Set tp:name-for-bindings on C.T.Tubes methods to include "D_Bus"

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Jan 19 02:55:30 PST 2009


This is ugly, but compatible with the camel-case-to-lower-case algorithm
currently used in telepathy-glib. When we upgrade the telepathy-glib
code generation to use tp:name-for-bindings, we don't want to cause an
ABI break.
---
 spec/Channel_Type_Tubes.xml |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/spec/Channel_Type_Tubes.xml b/spec/Channel_Type_Tubes.xml
index df98ac7..bb55c48 100644
--- a/spec/Channel_Type_Tubes.xml
+++ b/spec/Channel_Type_Tubes.xml
@@ -306,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>
@@ -458,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
@@ -580,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.
@@ -610,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.
@@ -640,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



More information about the Telepathy-commits mailing list