[next] telepathy-spec: spec: stop using 16bit integers

Jonny Lamb jonny at kemper.freedesktop.org
Thu Jun 7 06:41:34 PDT 2012


Module: telepathy-spec
Branch: next
Commit: f09d6af33813f2b9ae90b08fe2592273de8509c3
URL:    http://cgit.freedesktop.org/telepathy/telepathy-spec/commit/?id=f09d6af33813f2b9ae90b08fe2592273de8509c3

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Thu May 10 17:42:09 2012 +0100

spec: stop using 16bit integers

dbus-glib is unable to emit 16-bit integers, so we can't comply with
telepathy-spec in telepathy-glib. In practice, this means that our
D-Bus API has never been what we claim, which is likely to cause
problems for telepathy-qt4 (QtDBus is pickier about types).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=20776
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---

 spec/Call1_Stream_Interface_Media.xml |    4 ++--
 spec/generic-types.xml                |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/Call1_Stream_Interface_Media.xml b/spec/Call1_Stream_Interface_Media.xml
index 09d1e0c..d8500d7 100644
--- a/spec/Call1_Stream_Interface_Media.xml
+++ b/spec/Call1_Stream_Interface_Media.xml
@@ -569,11 +569,11 @@
         Emitted when the value of
         <tp:member-ref>STUNServers</tp:member-ref> changes.
       </tp:docstring>
-      <arg name="Servers" type="a(sq)" tp:type="Socket_Address_IP[]" />
+      <arg name="Servers" type="a(su)" tp:type="Socket_Address_IP[]" />
     </signal>
 
     <property name="STUNServers" tp:name-for-bindings="STUN_Servers"
-      type="a(sq)" tp:type="Socket_Address_IP[]" access="read">
+      type="a(su)" tp:type="Socket_Address_IP[]" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The IP addresses of possible STUN servers to use for NAT
           traversal, as dotted-quad IPv4 address literals or RFC2373
diff --git a/spec/generic-types.xml b/spec/generic-types.xml
index 4e68f31..4be8bec 100644
--- a/spec/generic-types.xml
+++ b/spec/generic-types.xml
@@ -110,7 +110,7 @@
         as for <tp:type>Socket_Address_IPv6</tp:type>.
       </tp:docstring>
     </tp:member>
-    <tp:member type="q" name="Port">
+    <tp:member type="u" name="Port">
       <tp:docstring>The TCP or UDP port number.</tp:docstring>
     </tp:member>
   </tp:struct>
@@ -122,7 +122,7 @@
         numbers, each between 0 and 255 inclusive, e.g.
         "192.168.0.1".</tp:docstring>
     </tp:member>
-    <tp:member type="q" name="Port">
+    <tp:member type="u" name="Port">
       <tp:docstring>The TCP or UDP port number.</tp:docstring>
     </tp:member>
   </tp:struct>
@@ -133,7 +133,7 @@
       <tp:docstring>An IPv6 address literal as specified by RFC2373
         section 2.2, e.g. "2001:DB8::8:800:200C:4171".</tp:docstring>
     </tp:member>
-    <tp:member type="q" name="Port">
+    <tp:member type="u" name="Port">
       <tp:docstring>The TCP or UDP port number.</tp:docstring>
     </tp:member>
   </tp:struct>



More information about the telepathy-commits mailing list