[evolution-data-server/gnome-2-30] Bug #612596 - Crash in gnome_keyring_item_info_free from e-passwords.c

[Milan Crha <mcrha src gnome org>]

commit 90a6ead715e47e3df9291c7fbee9bafbee10c144
Author: Milan Crha <mcrha redhat com>
Date:   Wed May 12 11:21:54 2010 +0200

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

 libedataserverui/e-passwords.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
index e675284..8d7a1b0 100644
--- a/libedataserverui/e-passwords.c
+++ b/libedataserverui/e-passwords.c
@@ -1273,12 +1273,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);
 }