summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-05-12 11:19:05 +0200
committerMilan Crha <mcrha@redhat.com>2010-05-12 11:22:27 +0200
commit9e517f5deb22ee2ad937afad5ef0b6969ffd55ae (patch)
tree479ef6d3ae1c3b9703918a302d6b0662a3abd65b
parenteb69b5dc79a2786850b87a3779ab9b2f9158f170 (diff)
downloadevolution-data-server-9e517f5deb22ee2ad937afad5ef0b6969ffd55ae.tar.gz
Bug #612596 - Crash in gnome_keyring_item_info_free from e-passwords.c
-rw-r--r--libedataserverui/e-passwords.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
index 1b0ee7b0f..36ced34f3 100644
--- a/libedataserverui/e-passwords.c
+++ b/libedataserverui/e-passwords.c
@@ -1290,12 +1290,13 @@ e_passwords_init (void)
* We might be able to extract passwords from it. */
key_file = g_key_file_new ();
ep_key_file_load ();
+
+ #ifdef WITH_GNOME_KEYRING
+ if (gnome_keyring_is_available ())
+ gnome_keyring_get_default_keyring_sync (&default_keyring);
+ #endif
}
-#ifdef WITH_GNOME_KEYRING
- if (gnome_keyring_is_available ())
- gnome_keyring_get_default_keyring_sync (&default_keyring);
-#endif
G_UNLOCK (passwords);
}