From: Stef Walter <stefw@gnome.org>
Date: Sat, 14 Jul 2012 11:25:39 +0000 (+0200)
Subject: Match schema names for notes and network passwords
X-Git-Tag: upstream/0.13~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45e01e66001fdc3399f3490baca5b02595ff801f;p=platform%2Fupstream%2Flibsecret.git

Match schema names for notes and network passwords

 * These are old item types from libgnome-keyring, and
   gnome-keyring-daemon has special code to generate the
   schema for these types of items.
---

diff --git a/libsecret/secret-schemas.c b/libsecret/secret-schemas.c
index 34798d0..b5c511b 100644
--- a/libsecret/secret-schemas.c
+++ b/libsecret/secret-schemas.c
@@ -22,11 +22,15 @@
  * A predefined schema for personal passwords stored by the user in the
  * password manager. This schema has no attributes, and the items are not
  * meant to be used automatically by applications.
+ *
+ * When used to search for items using this schema, it will only match
+ * items that have the same schema. Items stored via libgnome-keyring with the
+ * <literal>GNOME_KEYRING_ITEM_NOTE</literal> item type will match.
  */
 
 static const SecretSchema note_schema = {
 	"org.gnome.keyring.Note",
-	SECRET_SCHEMA_DONT_MATCH_NAME,
+	SECRET_SCHEMA_NONE,
 	{
 		{  "NULL", 0 },
 	}
@@ -42,6 +46,10 @@ const SecretSchema *  SECRET_SCHEMA_NOTE = &note_schema;
  * applications migrating from libgnome-keyring which stored their secrets as
  * 'network passwords'. It is not recommended that new code use this schema.
  *
+ * When used to search for items using this schema, it will only match
+ * items that have the same schema. Items stored via libgnome-keyring with the
+ * <literal>GNOME_KEYRING_ITEM_NETWORK_PASSWORD</literal> item type will match.
+ *
  * The following attributes exist in the schema:
  * <variablelist><title>Attributes:</title>
  *     <varlistentry><term><literal>user</literal>:</term>
@@ -63,7 +71,7 @@ const SecretSchema *  SECRET_SCHEMA_NOTE = &note_schema;
 
 static const SecretSchema network_schema = {
 	"org.gnome.keyring.NetworkPassword",
-	SECRET_SCHEMA_DONT_MATCH_NAME,
+	SECRET_SCHEMA_NONE,
 	{
 		{  "user", SECRET_SCHEMA_ATTRIBUTE_STRING },
 		{  "domain", SECRET_SCHEMA_ATTRIBUTE_STRING },