diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-26 17:43:42 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-26 17:47:07 +0100 |
commit | 224a21a88387343c4c7047ced55614594d105785 (patch) | |
tree | 0d2077559180882172f23e4643cc977937bc674b /spec/errors.xml | |
parent | 2afdf679d8b6304efacadaab7211a8d2a10fd793 (diff) | |
download | telepathy-glib-224a21a88387343c4c7047ced55614594d105785.tar.gz |
Update spec to 0.17.12 (no code changes) and prepare 0.7.16 releasetelepathy-glib-0.7.16
Diffstat (limited to 'spec/errors.xml')
-rw-r--r-- | spec/errors.xml | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/spec/errors.xml b/spec/errors.xml index 81ab440e7..679e3f4e2 100644 --- a/spec/errors.xml +++ b/spec/errors.xml @@ -1,5 +1,8 @@ <?xml version="1.0" ?> <tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="org.freedesktop.Telepathy.Error"> + <!-- Don't re-order these errors until fd.o #17588 is fixed, or you will + break telepathy-glib's ABI. + --> <tp:error name="Network Error"> <tp:docstring> Raised when there is an error reading from or writing to the network. @@ -60,8 +63,22 @@ </tp:docstring> </tp:error> - <tp:copyright>Copyright (C) 2005, 2006, 2007 Collabora Limited</tp:copyright> - <tp:copyright>Copyright (C) 2005, 2006, 2007 Nokia Corporation</tp:copyright> + <tp:error name="Not Yours"> + <tp:docstring> + The requested channel or other resource already exists, and another + client is responsible for it + </tp:docstring> + </tp:error> + + <tp:error name="Cancelled"> + <tp:docstring> + Raised by an ongoing request if it is cancelled by user request before + it has completed. + </tp:docstring> + </tp:error> + + <tp:copyright>Copyright (C) 2005-2008 Collabora Limited</tp:copyright> + <tp:copyright>Copyright (C) 2005-2008 Nokia Corporation</tp:copyright> <tp:license xmlns="http://www.w3.org/1999/xhtml"> <p>This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public |