gboolean expunge, leave_on_server;
const gchar *account_name;
TnyAccount *account;
+ ModestTransportStoreProtocol account_proto;
tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
account_name);
- if (TNY_IS_CAMEL_POP_FOLDER (folder) && !leave_on_server)
+ account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+
+ if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+ modest_tny_folder_is_remote_folder (folder) == FALSE)
expunge = TRUE;
else
expunge = FALSE;
gboolean expunge, leave_on_server;
const gchar *account_name;
TnyAccount *account;
+ ModestTransportStoreProtocol account_proto;
account = tny_folder_get_account (folder);
account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
account_name);
- if (TNY_IS_CAMEL_POP_FOLDER (folder) && !leave_on_server)
+ account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+
+ if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+ modest_tny_folder_is_remote_folder (folder) == FALSE)
expunge = TRUE;
else
expunge = FALSE;