X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=34a5001c36a9e0979955dda83a97edfa4082909d;hp=688399d62ec251723b814e07e97bfad0ffe57f51;hb=a98797d91117fe13e37b3f3217d9506a1db88724;hpb=625f34469b95b184265adbedc04531837936ba7b

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 688399d..34a5001 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2490,8 +2490,9 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 	if (!priv->error) {
 		gboolean expunge, leave_on_server;
 		const gchar *account_name;
+		const gchar *proto;
 		TnyAccount *account;
-		ModestTransportStoreProtocol account_proto;
+		ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
 		
 		account = tny_folder_get_account (folder);
 		account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
@@ -2499,7 +2500,10 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 			modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
 					account_name);
 
-		account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+		proto = tny_account_get_proto (account);
+		if (proto) {
+			account_proto = modest_protocol_info_get_transport_store_protocol (proto);
+		}
 
 		if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
 		    modest_tny_folder_is_remote_folder (folder) == FALSE)