[PATCH] Error code changes.

Stef Walter stef at memberwebs.com
Fri Dec 11 13:51:30 PST 2009


 * 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.
---
 specifications/Secrets/org.freedesktop.Secrets.xml |   21 ++++---------------
 specifications/Secrets/specification.xml           |    3 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/specifications/Secrets/org.freedesktop.Secrets.xml b/specifications/Secrets/org.freedesktop.Secrets.xml
index 8840395..f1f4ba8 100644
--- a/specifications/Secrets/org.freedesktop.Secrets.xml
+++ b/specifications/Secrets/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/specifications/Secrets/specification.xml b/specifications/Secrets/specification.xml
index 2caf5c7..5ec4158 100644
--- a/specifications/Secrets/specification.xml
+++ b/specifications/Secrets/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>
 
-- 
1.6.3.3


--------------080306090506080709030902--


More information about the Authentication mailing list