Update to telepathy-spec 0.21.12

3 files changed, 71 insertions, 8 deletions

diff --git a/spec/Connection_Interface_Cellular.xml b/spec/Connection_Interface_Cellular.xml
index 99a360283..e9b10e3c5 100644
--- a/spec/Connection_Interface_Cellular.xml
+++ b/spec/Connection_Interface_Cellular.xml
@@ -117,13 +117,39 @@
       type="b" access="readwrite"
       tp:is-connection-parameter='no... just kidding! yes!'>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Determines whether SMSes containing characters that do not fit into
-          a 7‐bit GSM character set should be sent as UCS‐2, or lossily
-          recoded. If <code>False</code> (which SHOULD be the default),
-          messages will be sent with no loss of fidelity (at the potential
-          financial cost of using twice as many SMSes); if <code>True</code>,
-          the message will be recoded in an implementation‐specific way to fit
-          into a country‐specific GSM reduced character set.</p>
+        <p>Determines how to encode SMSes containing characters that do not
+          fit into a non-Unicode character set.
+          If <code>False</code> (which SHOULD be the default), messages will
+          be encoded as UCS-2 and sent with no loss of fidelity (at the
+          potential financial cost of using twice as many SMSes); if
+          <code>True</code>, the message will be recoded in an
+          implementation‐specific way to fit into a GSM reduced character
+          set.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="MessageNationalCharacterSet"
+      tp:name-for-bindings="Message_National_Character_Set"
+      type="s" access="readwrite"
+      tp:is-connection-parameter='affirmative'>
+      <tp:added version="0.21.12"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Hint for the connection manager for the GSM character set that
+          should be used to send SMSes. The connection manager SHOULD follow
+          this hint unless it has other ways to determine a better encoding.
+          If the value is <code>"gsm"</code> (which SHOULD be the default),
+          SMSes will be encoded in the normal 7-bit GSM character set,
+          eventually falling back to UCS-2; see the
+          <tp:member-ref>MessageReducedCharacterSet</tp:member-ref> property
+          for details.
+          Other valid character sets are specified in the
+          <a href="http://www.3gpp.org/ftp/specs/archive/23_series/23.038/"
+            >GSM standard</a> and are, for instance, <code>"turkey"</code>,
+          <code>"spain"</code> or <code>"portugal"</code>.
+          If the SMS cannot be encoded using the requested character set the
+          behaviour is implementation-specific, but it is RECOMMENDED that
+          the connection manager should behave as if this property was set
+          to <code>"gsm"</code>.</p>
       </tp:docstring>
     </property>
   </interface>
diff --git a/spec/all.xml b/spec/all.xml
index 95d8574de..fccf75c95 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>Telepathy D-Bus Interface Specification</tp:title>
-<tp:version>0.21.11</tp:version>
+<tp:version>0.21.12</tp:version>
 
 <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright>
 <tp:copyright>Copyright © 2005-2010 Nokia Corporation</tp:copyright>
diff --git a/spec/errors.xml b/spec/errors.xml
index eccbd0953..d63662edb 100644
--- a/spec/errors.xml
+++ b/spec/errors.xml
@@ -544,6 +544,43 @@
     </tp:docstring>
   </tp:error>
 
+  <tp:error name="Software Upgrade Required">
+    <tp:added version="0.21.12"/>
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>Raised as a
+        <tp:dbus-ref namespace="ofdT.Connection">ConnectionError</tp:dbus-ref>
+        when a Connection cannot be established because either the Connection
+        Manager or its support library (e.g. wocky, papyon, sofiasip) requires
+        upgrading to support a newer protocol version.</p>
+
+      <p>This error corresponds to the
+        <tp:type>Connection_Status_Reason</tp:type> of Network_Error.</p>
+
+      <tp:rationale>
+        Some protocols transmit a protocol or library version number to the
+        server, which will disconnect them if the version isn't appropriate.
+        This way we can report the error to the user, and if appropriate, the
+        user's client can check for updates.
+      </tp:rationale>
+    </tp:docstring>
+  </tp:error>
+
+  <tp:error name="Emergency Calls Not Supported">
+    <tp:added version="0.21.12"/>
+    <tp:docstring>
+      Raised if a client attempts to dial a number that is recognized as an
+      emergency number (e.g. '911' in the USA), but the Connection Manager or
+      provider does not support dialling emergency numbers.
+
+      <tp:rationale>
+        Many VOIP providers have the ability to dial traditional (PSTN)
+        telephone numbers, but do not provide the ability to dial emergency
+        numbers (for instance, Google Voice).  This error provides additional
+        information about why such a call was unsuccessful.
+      </tp:rationale>
+    </tp:docstring>
+  </tp:error>
+
   <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2005-2009 Nokia Corporation</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">