summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Ruprecht <mike.ruprecht@collabora.co.uk>2012-02-01 15:17:35 -0600
committerMike Ruprecht <mike.ruprecht@collabora.co.uk>2012-02-01 15:17:35 -0600
commit95a502a36dd6fb7082b78be993eae400bf0903ac (patch)
tree56a57d9a1f7f0fa00e0d9cb23eb838b79d7bf3cf
parentb9eddb9b85304e00c6d4ddce99d7db7d56319af3 (diff)
A few more revisions based on comments in fd.o bug #32125
-rw-r--r--spec/Channel_Interface_Captcha_Authentication.xml11
-rw-r--r--spec/errors.xml2
2 files changed, 11 insertions, 2 deletions
diff --git a/spec/Channel_Interface_Captcha_Authentication.xml b/spec/Channel_Interface_Captcha_Authentication.xml
index c703e7df..eb53b4b6 100644
--- a/spec/Channel_Interface_Captcha_Authentication.xml
+++ b/spec/Channel_Interface_Captcha_Authentication.xml
@@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
</tp:license>
<interface name="org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1">
- <tp:added version="0.21.5">(version 1)</tp:added>
+ <tp:added version="0.UNRELEASED">(version 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Channel"/>
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal"
value="true"/>
@@ -396,6 +396,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
The Handler doesn't support the given/required captcha types.
If this is used, the <tp:member-ref>CaptchaError</tp:member-ref>
SHOULD be set to <tp:error-ref>CaptchaNotSupported</tp:error-ref>.
+ This SHOULD also be used if
+ <tp:dbus-ref namespace="ofdT.Channel">Close</tp:dbus-ref> is called
+ before <tp:member-ref>Cancel</tp:member-ref>.
+ <tp:rationale>
+ If no Handler supports captcha channels,
+ the ChannelDispatcher will just call
+ <tp:dbus-ref namespace="ofdT.Channel">Close</tp:dbus-ref>,
+ because it has no knowledge of specific channel types.
+ </tp:rationale>
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="Service_Confused" value="2">
diff --git a/spec/errors.xml b/spec/errors.xml
index b0cd9c2d..c9e85dd3 100644
--- a/spec/errors.xml
+++ b/spec/errors.xml
@@ -638,7 +638,7 @@
</tp:error>
<tp:error name="Captcha Not Supported">
- <tp:added version="0.21.5.UNRELEASED"/>
+ <tp:added version="0.UNRELEASED"/>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>Raised if the <tp:dbus-ref
namespace="ofdT.Channel.Interface">CaptchaAuthentication1</tp:dbus-ref>