[evolution/email-factory-3-4: 9/38] Ported 2a384708440fb3adc32beaf0ae640208efe95476

[Srinivasa Ragavan <sragavan src gnome org>]

commit 3d0ef51cc6e9a31c61d8226570a4e5ab784aec06
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Mon Oct 31 12:36:51 2011 +0530

    Ported 2a384708440fb3adc32beaf0ae640208efe95476

 libemail-engine/e-mail-store.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libemail-engine/e-mail-store.c b/libemail-engine/e-mail-store.c
index db5b94e..a3aeb82 100644
--- a/libemail-engine/e-mail-store.c
+++ b/libemail-engine/e-mail-store.c
@@ -368,7 +368,8 @@ handle_transport:
 		camel_url_free (url);
 	}
 
-	if (!skip && (provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+	if (!skip && (provider->flags & CAMEL_PROVIDER_IS_STORAGE) != 0 && store_table != NULL)
+		
 		e_mail_store_add (session, CAMEL_STORE (service));
 
 	return CAMEL_STORE (service);
@@ -433,7 +434,7 @@ e_mail_store_remove_by_account (EMailSession *session,
 	provider = camel_service_get_provider (service);
 	g_return_if_fail (provider != NULL);
 
-	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE) || store_table == NULL)
 		return;
 
 	e_mail_store_remove (session, CAMEL_STORE (service));