Bug #612596 - Crash in gnome_keyring_item_info_free from e-passwords.c

diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
index 1b0ee7b..36ced34 100644 (file)
--- 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);
 }