From 95d422b0c016e4b8c60100dc47b2e70ad6b2757a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 29 Oct 2010 09:08:52 +0200 Subject: Bug #633371 - Remote pop folder no longer emptied --- mail/em-folder-utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail/em-folder-utils.c') diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index d457e90ecc..c2720fc5ae 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -153,7 +153,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m, camel_store_rename_folder_sync ( m->fromstore, info->full_name, toname->str, cancellable, error); - if (error != NULL) + if (error && *error) goto exception; /* this folder no longer exists, unsubscribe it */ @@ -185,7 +185,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m, cancellable, error); camel_folder_free_uids (fromfolder, uids); - if (m->delete && error == NULL) + if (m->delete && (!error || !*error)) camel_folder_synchronize_sync ( fromfolder, TRUE, NULL, NULL); @@ -195,7 +195,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m, } } - if (error != NULL) + if (error && *error) goto exception; else if (m->delete && !deleted) deleting = g_list_prepend (deleting, info); -- cgit v1.2.3