diff options
| author | Stef Walter <stefw@gnome.org> | 2012-08-11 07:18:59 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-08-17 10:27:15 +0200 |
| commit | 747b37bbd8fb82830524c8603f6fcf1ceae605dc (patch) | |
| tree | 008369d57e4c69f8ec41b42805f7ae6a749805e4 /pkcs11/secret-store | |
| parent | 6700ef0a6aa8a43a4ba2b43b30a85206407d1264 (diff) | |
| download | gnome-keyring-747b37bbd8fb82830524c8603f6fcf1ceae605dc.tar.gz | |
Use the XDG directories for storing keys
* If the new XDG directory doesn't exist, and the old
~/.gnome2/keyrings does exist, then continue to use that
* Otherwise create the new directory in g_get_user_data_dir() as
appropriate.
https://bugzilla.gnome.org/show_bug.cgi?id=613644
Diffstat (limited to 'pkcs11/secret-store')
| -rw-r--r-- | pkcs11/secret-store/gkm-secret-module.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkcs11/secret-store/gkm-secret-module.c b/pkcs11/secret-store/gkm-secret-module.c index cb22b0a4..42d93f7a 100644 --- a/pkcs11/secret-store/gkm-secret-module.c +++ b/pkcs11/secret-store/gkm-secret-module.c @@ -28,8 +28,11 @@ #include "gkm-secret-store.h" #include "gkm/gkm-credential.h" +#define DEBUG_FLAG GKM_DEBUG_STORAGE +#include "gkm/gkm-debug.h" #include "gkm/gkm-file-tracker.h" #include "gkm/gkm-transaction.h" +#include "gkm/gkm-util.h" #include <glib/gstdio.h> @@ -391,11 +394,9 @@ gkm_secret_module_constructor (GType type, guint n_props, GObjectConstructParam g_return_val_if_fail (self, NULL); - if (!self->directory) { - self->directory = g_build_filename (g_get_home_dir (), ".gnome2", "keyrings", NULL); - if (g_mkdir_with_parents (self->directory, S_IRWXU) < 0) - g_warning ("unable to create keyring dir: %s", self->directory); - } + if (!self->directory) + self->directory = gkm_util_locate_keyrings_directory (); + gkm_debug ("secret store directory: %s", self->directory); self->tracker = gkm_file_tracker_new (self->directory, "*.keyring", NULL); g_signal_connect (self->tracker, "file-added", G_CALLBACK (on_file_load), self); |