[evolution/email-factory-3-4: 53/53] Fix a compilation error.

[Srinivasa Ragavan <sragavan src gnome org>]

commit b05c16254c307fc9c1a93def9f711df5bd42eefe
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Tue Jan 17 19:21:02 2012 +0530

    Fix a compilation error.

 libemail-engine/e-mail-session.c |   10 ----------
 mail/e-mail-ui-session.c         |   33 +++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index ee3ae55..04aa5ba 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -741,16 +741,6 @@ mail_session_initialize_stores_idle (gpointer user_data)
 
 	g_object_unref (iter);
 
-	/* Initialize which account is default. */
-	account = e_get_default_account ();
-	if (account != NULL) {
-		CamelService *service;
-
-		service = camel_session_get_service (
-			CAMEL_SESSION (session), account->uid);
-		e_mail_account_store_set_default_service (
-			session->priv->account_store, service);
-	}
 	return FALSE;
 }
 
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index 1bce1e1..fe253f2 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -577,6 +577,28 @@ mail_ui_session_account_changed_cb (EAccountList *account_list,
 			folder_tree_model, CAMEL_STORE (service));
 }
 
+static gboolean
+mail_ui_session_initialize_stores_idle (gpointer user_data)
+{
+	EMailSession *session = user_data;
+	EAccount *account;
+
+	g_return_val_if_fail (session != NULL, FALSE);
+
+	/* Initialize which account is default. */
+	account = e_get_default_account ();
+	if (account != NULL) {
+		CamelService *service;
+
+		service = camel_session_get_service (
+			CAMEL_SESSION (session), account->uid);
+		e_mail_account_store_set_default_service (
+			priv->account_store, service);
+	}
+
+	return FALSE;
+}
+
 static void
 mail_ui_session_constructed (GObject *object)
 {
@@ -615,16 +637,7 @@ mail_ui_session_constructed (GObject *object)
 
 	mail_ui_session_add_vfolder_store (uisession);
 
-	/* Initialize which account is default. */
-	account = e_get_default_account ();
-	if (account != NULL) {
-		CamelService *service;
-
-		service = camel_session_get_service (
-			CAMEL_SESSION (session), account->uid);
-		e_mail_account_store_set_default_service (
-			priv->account_store, service);
-	}
+	g_idle_add (mail_ui_session_initialize_stores_idle, object);
 
 	handler_id = g_signal_connect (
 		account_list, "account-changed",