From e94829fd5ec3a23ffeda13cd56ec14d5b2eceb3d Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Fri, 11 Dec 2009 21:57:59 +0000
Subject: Support for collection aliases.

The collection aliases are present under:

/org/freedesktop/secrets/aliases/xxxx

So the default and network collections would be usable via
the object path, in addition to their normal object paths:

/org/freedesktop/secrets/aliases/default
/org/freedesktop/secrets/aliases/network

To manage the aliases, two new methods are added to the
Service interface: ReadAlias() and SetAlias(). BTW, These
are not properties on Collection because a collection can
be have multiple aliases pointing to it.
---
 secret-service/org.freedesktop.Secrets.xml | 26 ++++++++++++++++++++------
 secret-service/specification.xml           | 11 ++++-------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/secret-service/org.freedesktop.Secrets.xml b/secret-service/org.freedesktop.Secrets.xml
index a681d79..73c275b 100644
--- a/secret-service/org.freedesktop.Secrets.xml
+++ b/secret-service/org.freedesktop.Secrets.xml
@@ -83,12 +83,6 @@
                 <tp:docstring>The object paths of all collections (ie: keyrings)</tp:docstring>
             </property>
 
-            <property name="DefaultCollection" type="o" access="readwrite">
-                <tp:docstring>
-                    The object path of the default collection, or an empty string if no collections exist.
-                </tp:docstring>
-            </property>
-
             <method name="OpenSession">
                 <tp:docstring>Open a unique session for the caller application.</tp:docstring>
                 <arg name="algorithm" type="s" direction="in">
@@ -170,6 +164,26 @@
                 </arg>
             </method>
 
+            <method name="ReadAlias">
+                <tp:docstring>Get the collection with the given alias.</tp:docstring>
+                <arg name="name" type='s' direction='in'>
+                    <tp:docstring>An alias, such as 'default'.</tp:docstring>
+                </arg>
+                <arg name="collection" type='o' direction='out'>
+                    <tp:docstring>The collection or the the path '/' if no such collection exists.</tp:docstring>
+                </arg>
+            </method>
+
+            <method name="SetAlias">
+                <tp:docstring>Setup a collection alias.</tp:docstring>
+                <arg name="name" type='s' direction='in'>
+                    <tp:docstring>An alias, such as 'default'.</tp:docstring>
+                </arg>
+                <arg name="collection" type='o' direction='in'>
+                    <tp:docstring>The collection.</tp:docstring>
+                </arg>
+            </method>
+
             <signal name="CollectionCreated">
                 <tp:docstring>A collection was created.</tp:docstring>
                 <arg name="collection" type="o">
diff --git a/secret-service/specification.xml b/secret-service/specification.xml
index f305cbe..2902232 100644
--- a/secret-service/specification.xml
+++ b/secret-service/specification.xml
@@ -109,11 +109,7 @@
 			 error should be raised.</para>
 
 			<para>Client applications without special requirements should store in the default
-			collection. Use the
-			<link linkend='org.freedesktop.Secret.Service.DefaultCollection'>
-			<property>DefaultCollection</property></link>
-			property on the Service interface to determine the default collection. In addition
-			the default collection is always accessible through a
+			collection. The default collection is always accessible through a
 			<link linkend='object-paths'>specific object path</link>.</para>
 
 			<para>A new item can be created with the
@@ -485,9 +481,10 @@
 			<para>The object path for a session, where <emphasis>ssss</emphasis> is an auto-generated
 			session specific identifier.</para>
 
-			<programlisting>/org/freedesktop/secrets/default</programlisting>
+			<programlisting>/org/freedesktop/secrets/aliases/default</programlisting>
 			<para>The default collection for client applications to store secrets is available under
-			this object path in addition to its real object path (above).</para>
+			this object path in addition to its real object path (above). Other aliases may also be
+			present.</para>
 		</chapter>
 
 		<xi:include href="reference.xml" xpointer="interfaces" xmlns:xi="http://www.w3.org/2001/XInclude">
-- 
cgit v1.2.3-70-g09d2