diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-10-29 15:08:52 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-10-29 15:08:52 +0800 |
| commit | 95d422b0c016e4b8c60100dc47b2e70ad6b2757a (patch) | |
| tree | d4fe97a827ec488da7b03f5aef5d13b378c4c229 /mail/em-folder-utils.c | |
| parent | a95d55794a80579e7f3028c4c3fd59270e552fa0 (diff) | |
| download | gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.gz gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.bz2 gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.lz gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.xz gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.zst gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.zip | |
Bug #633371 - Remote pop folder no longer emptied
Diffstat (limited to 'mail/em-folder-utils.c')
| -rw-r--r-- | mail/em-folder-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |