[gnome-keyring/trust-store] [daemon] Load the new xdg-store storage module.

[Stefan Walter <stefw src gnome org>]

commit 997aab8d486b473e08cdfd2fba0c501bd65b822c
Author: Stef Walter <stef memberwebs com>
Date:   Sat Sep 18 21:27:49 2010 +0000

    [daemon] Load the new xdg-store storage module.
    
    Currently only trust exceptions are being stored here.

 daemon/Makefile.am  |    1 +
 daemon/gkd-pkcs11.c |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6a8670d..ea69cd0 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -42,6 +42,7 @@ gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/pkcs11/secret-store/libgkm-secret-store.la \
 	$(top_builddir)/pkcs11/ssh-store/libgkm-ssh-store.la \
 	$(top_builddir)/pkcs11/gnome2-store/libgkm-gnome2-store.la \
+	$(top_builddir)/pkcs11/xdg-store/libgkm-xdg-store.la \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/gck/libgck.la \
 	$(top_builddir)/egg/libegg-dbus.la \
diff --git a/daemon/gkd-pkcs11.c b/daemon/gkd-pkcs11.c
index 3553c37..fef29c9 100644
--- a/daemon/gkd-pkcs11.c
+++ b/daemon/gkd-pkcs11.c
@@ -32,6 +32,7 @@
 #include "pkcs11/secret-store/gkm-secret-store.h"
 #include "pkcs11/ssh-store/gkm-ssh-store.h"
 #include "pkcs11/gnome2-store/gkm-gnome2-store.h"
+#include "pkcs11/xdg-store/gkm-xdg-store.h"
 
 #include "gpg-agent/gkd-gpg-agent.h"
 #include "ssh-agent/gkd-ssh-agent.h"
@@ -69,6 +70,7 @@ gkd_pkcs11_initialize (void)
 	CK_FUNCTION_LIST_PTR secret_store;
 	CK_FUNCTION_LIST_PTR ssh_store;
 	CK_FUNCTION_LIST_PTR gnome2_store;
+	CK_FUNCTION_LIST_PTR xdg_store;
 	CK_C_INITIALIZE_ARGS init_args;
 	gboolean ret;
 	CK_RV rv;
@@ -82,9 +84,12 @@ gkd_pkcs11_initialize (void)
 	/* Root certificates */
 	roots_store = gkm_roots_store_get_functions ();
 
-	/* User certificates */
+	/* Old User certificates */
 	gnome2_store = gkm_gnome2_store_get_functions ();
 
+	/* User certificates */
+	xdg_store = gkm_xdg_store_get_functions ();
+
 	/* Add all of those into the wrapper layer */
 	gkm_wrap_layer_add_module (ssh_store);
 #ifdef ROOT_CERTIFICATES
@@ -92,6 +97,7 @@ gkd_pkcs11_initialize (void)
 #endif
 	gkm_wrap_layer_add_module (secret_store);
 	gkm_wrap_layer_add_module (gnome2_store);
+	gkm_wrap_layer_add_module (xdg_store);
 
 	pkcs11_roof = gkm_wrap_layer_get_functions ();
 	pkcs11_base = gkm_wrap_layer_get_functions_no_prompts ();