[evolution/email-factory-3-4: 14/14] Fix some compilation errors.

[Srinivasa Ragavan <sragavan src gnome org>]

commit b1f137fd21e52cb7ac46ddf3b44ebad969ce958a
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Mon Oct 31 15:56:45 2011 +0530

    Fix some compilation errors.

 libemail-engine/e-mail-store.c  |    2 +-
 libemail-engine/mail-ops.c      |    2 +-
 mail/e-mail-migrate.c           |    2 --
 mail/em-folder-tree.c           |    1 -
 modules/mail/em-account-prefs.c |    1 -
 5 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/libemail-engine/e-mail-store.c b/libemail-engine/e-mail-store.c
index e1a6148..089277c 100644
--- a/libemail-engine/e-mail-store.c
+++ b/libemail-engine/e-mail-store.c
@@ -350,7 +350,7 @@ e_mail_store_add_by_account (EMailSession *session,
 		!service_is_local_delivery;
 
 	if (service_belongs_in_tree_model && store_table != NULL)
-		e_mail_store_add (backend, CAMEL_STORE (service));
+		e_mail_store_add (session, CAMEL_STORE (service));
 
 handle_transport:
 
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 6fac9cd..d0abd9c 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -211,7 +211,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
 	struct _filter_mail_msg *fm = (struct _filter_mail_msg *) m;
 	CamelFolder *folder = NULL;
 	CamelURL *url;
-	gboolean is_local_delivery;
+	gboolean is_local_delivery = FALSE;
 	const gchar *uid;
 	gint i;
 
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 3fb40c7..e17bcae 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -716,7 +716,6 @@ migrate_to_db (EShellBackend *shell_backend)
 	mail_backend = E_MAIL_BACKEND (shell_backend);
 	mail_session = e_mail_backend_get_session (mail_backend);
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
-	msession = e_mail_backend_get_session (mail_backend);
 
 	/* Initialize the mail stores early so we can add a new one. */
 	e_mail_store_init (mail_session, data_dir);
@@ -1030,7 +1029,6 @@ create_mbox_account (EShellBackend *shell_backend,
 	mail_backend = E_MAIL_BACKEND (shell_backend);
 	mail_session = e_mail_backend_get_session (mail_backend);
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
-	msession = e_mail_backend_get_session (mail_backend);
 
 	/* Initialize the mail stores early so we can add a new one. */
 	e_mail_store_init (mail_session, data_dir);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 66a64c3..97b281d 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1787,7 +1787,6 @@ em_folder_tree_new_with_model (EMailBackend *backend,
 {
 	EMailSession *session;
 	const gchar *data_dir;
-	EMailSession *session;
 
 	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
 	g_return_val_if_fail (E_IS_ALERT_SINK (alert_sink), NULL);
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 0f40385..54106ed 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -118,7 +118,6 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view,
 	EMailSession *session;
 	EAccountList *account_list;
 	EAccount *account;
-	EMailSession *session;
 	gpointer parent;
 	gint response;