[gnome-keyring] [gcr] Redo the PKCS#11 configuration file.

[Stefan Walter <stefw src gnome org>]

commit 33ff270423051658df16da9916e377b587c7b212
Author: Stef Walter <stef memberwebs com>
Date:   Tue Jan 4 16:57:48 2011 -0600

    [gcr] Redo the PKCS#11 configuration file.
    
    Use /etc/pkcs11/pkcs11-options and pkcs11-options.defaults files
    instead. Don't use XDG style stuff if we're not going to follow
    the XDG base dir specification.

 gcr/Makefile.am                                    |    4 ++--
 gcr/gcr-library.c                                  |    4 ++--
 ...kcs11.conf.defaults => pkcs11-options.defaults} |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index eb066b7..8477714 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -11,10 +11,10 @@ ui_DATA = \
 # ------------------------------------------------------------------
 # CONFIG
 
-confdir = $(sysconfdir)/xdg
+confdir = $(sysconfdir)/pkcs11
 
 conf_DATA = \
-	pkcs11.conf.defaults
+	pkcs11-options.defaults
 
 # ------------------------------------------------------------------
 # HEADERS
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index eba3763..3619987 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -170,7 +170,7 @@ _gcr_initialize (void)
 		key_file = g_key_file_new ();
 
 		/* Load the defaults */
-		path = g_build_filename (config_dir, "pkcs11.conf.defaults", NULL);
+		path = g_build_filename (config_dir, "pkcs11-options.defaults", NULL);
 		if (!g_key_file_load_from_file (key_file, path, G_KEY_FILE_NONE, &error)) {
 			g_warning ("couldn't parse %s file: %s", path, egg_error_message (error));
 			g_clear_error (&error);
@@ -178,7 +178,7 @@ _gcr_initialize (void)
 		g_free (path);
 
 		/* Load any overrides */
-		path = g_build_filename (config_dir, "pkcs11.conf", NULL);
+		path = g_build_filename (config_dir, "pkcs11-options.conf", NULL);
 		if (g_file_test (path, G_FILE_TEST_EXISTS) &&
 		    !g_key_file_load_from_file (key_file, path, G_KEY_FILE_NONE, &error)) {
 			g_warning ("couldn't parse %s file: %s", path, egg_error_message (error));
diff --git a/gcr/pkcs11.conf.defaults b/gcr/pkcs11-options.defaults
similarity index 55%
rename from gcr/pkcs11.conf.defaults
rename to gcr/pkcs11-options.defaults
index 6b8448e..fba2c7d 100644
--- a/gcr/pkcs11.conf.defaults
+++ b/gcr/pkcs11-options.defaults
@@ -6,8 +6,8 @@
 # http://tools.ietf.org/html/draft-pechanec-pkcs11uri-03
 #
 # Do not change the settings here. Put your changes or overrides in
-# a file called "pkcs11.conf" in the same directory.
+# a file called "pkcs11-options.conf" in the same directory.
 
 [trust-assertions]
-lookups=pkcs11:manufacturer=Gnome%20Keyring;serial=1:ROOTS:DEFAULT pkcs11:manufacturer=Gnome%20Keyring;serial=1:XDG:DEFAULT
-storage=pkcs11:manufacturer=Gnome%20Keyring;serial=1:XDG:DEFAULT
+lookups=pkcs11:library-manufacturer=Gnome%20Keyring;serial=1:ROOTS:DEFAULT pkcs11:library-manufacturer=Gnome%20Keyring;serial=1:XDG:DEFAULT
+storage=pkcs11:library-manufacturer=Gnome%20Keyring;serial=1:XDG:DEFAULT