[evolution/gnome-3-2] Bug #663294 - Crash when searching in Current Account/All Accounts

[Milan Crha <mcrha src gnome org>]

commit b24bc346c3a36b309cc6cd97216340953437ca5a
Author: Milan Crha <mcrha redhat com>
Date:   Fri Feb 17 11:39:58 2012 +0100

    Bug #663294 - Crash when searching in Current Account/All Accounts

 modules/mail/e-mail-shell-view.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 5759b58..f142514 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -554,9 +554,13 @@ all_accounts:
 
 	list = NULL;  /* list of CamelFolders */
 
+	/* enable search folders, in case they were disabled, because it's needed for this */
+	vfolder_load_storage (backend);
+
 	/* FIXME Complete lack of error checking here. */
 	service = camel_session_get_service (
 		CAMEL_SESSION (session), "vfolder");
+	g_return_if_fail (service != NULL);
 	em_utils_connect_service_sync (service, NULL, NULL);
 
 	search_folder = (CamelVeeFolder *) camel_vee_folder_new (
@@ -727,9 +731,13 @@ current_account:
 
 	list = g_list_reverse (list);
 
+	/* enable search folders, in case they were disabled, because it's needed for this */
+	vfolder_load_storage (backend);
+
 	/* FIXME Complete lack of error checking here. */
 	service = camel_session_get_service (
 		CAMEL_SESSION (session), "vfolder");
+	g_return_if_fail (service != NULL);
 	em_utils_connect_service_sync (service, NULL, NULL);
 
 	search_folder = (CamelVeeFolder *) camel_vee_folder_new (