diff options
| author | Stef Walter <stef@memberwebs.com> | 2009-12-11 21:51:30 +0000 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2010-12-04 16:11:42 +0000 |
| commit | 9b0a610bda7d6b99fa2f61bb77493c671eb1fb41 (patch) | |
| tree | f0981476b7f23c135dc75ca69d335f899d242d6b | |
| parent | 33d5f4c05d1f52d1c212633818bdd1038ea5b467 (diff) | |
| download | xdg-specs-9b0a610bda7d6b99fa2f61bb77493c671eb1fb41.tar.xz | |
Error code changes.
* Remove AlreadyExists. No longer needed.
* Remove NotSupported in favor of the one defined in DBus
itself: org.freedesktop.DBus.Error.NotSupported
* There's no real NoSuchObject error code defined in DBus itself,
so defined our own.
| -rw-r--r-- | secret-service/org.freedesktop.Secrets.xml | 21 | ||||
| -rw-r--r-- | secret-service/specification.xml | 3 |
2 files changed, 6 insertions, 18 deletions
diff --git a/secret-service/org.freedesktop.Secrets.xml b/secret-service/org.freedesktop.Secrets.xml index 5757abd..a681d79 100644 --- a/secret-service/org.freedesktop.Secrets.xml +++ b/secret-service/org.freedesktop.Secrets.xml @@ -24,25 +24,14 @@ <tp:errors namespace="org.freedesktop.Secret.Error"> <tp:docstring>Errors returned by the Secret Service API.</tp:docstring> - <tp:error name="AlreadyExists"> - <tp:docstring> - An object (session, collection) already exists with the same name. - </tp:docstring> - </tp:error> <tp:error name="IsLocked"> - <tp:docstring> - The object must be unlocked before this action can be carried out. - </tp:docstring> - </tp:error> - <tp:error name="NotSupported"> - <tp:docstring> - The algorithm is not supported. - </tp:docstring> + <tp:docstring>The object must be unlocked before this action can be carried out.</tp:docstring> </tp:error> <tp:error name="NoSession"> - <tp:docstring> - A session must be established before this action can be carried out. - </tp:docstring> + <tp:docstring>The session does not exist.</tp:docstring> + </tp:error> + <tp:error name="NoSuchObject"> + <tp:docstring>No such item or collection exists.</tp:docstring> </tp:error> </tp:errors> diff --git a/secret-service/specification.xml b/secret-service/specification.xml index e69d116..f305cbe 100644 --- a/secret-service/specification.xml +++ b/secret-service/specification.xml @@ -263,8 +263,7 @@ specific.</para> <para>If a service does not support a specific set of algorithms, a - <link linkend='org.freedesktop.Secret.Error.NotSupported'> - <errorname>NotSupported</errorname></link> + <errorname>org.freedesktop.DBus.Error.NotSupported</errorname> error is returned, and the client is free to try another set of algorithms. The <emphasis>plain</emphasis> algorithm is almost always supported.</para> |