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 | |
| parent | a95d55794a80579e7f3028c4c3fd59270e552fa0 (diff) | |
| download | gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.gz gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.tar.zst gsoc2013-evolution-95d422b0c016e4b8c60100dc47b2e70ad6b2757a.zip | |
Bug #633371 - Remote pop folder no longer emptied
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-folder-tree.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-utils.c | 6 | ||||
| -rw-r--r-- | mail/mail-ops.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index b08da8c849..1a40973f5f 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1831,7 +1831,7 @@ folder_tree_drop_async__exec (struct _DragDataReceivedAsync *m, em_utils_selection_get_uidlist ( m->selection, m->session, folder, m->move, cancellable, error); - m->moved = m->move && (error == NULL); + m->moved = m->move && (!error || !*error); break; case DND_DROP_TYPE_MESSAGE_RFC822: /* import a message/rfc822 stream */ 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); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 88e327bbf4..ffaa7e41af 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -244,7 +244,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m, if (!strncmp (m->source_uri, "mbox:", 5)) { gchar *path = mail_tool_do_movemail (m->source_uri, error); - if (path && error == NULL) { + if (path && (!error || !*error)) { camel_folder_freeze (fm->destination); camel_filter_driver_set_default_folder ( fm->driver, fm->destination); @@ -253,7 +253,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m, cancellable, error); camel_folder_thaw (fm->destination); - if (error == NULL) + if (!error || !*error) g_unlink (path); } g_free (path); @@ -301,7 +301,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m, camel_uid_cache_save (cache); } - if (fm->delete && error == NULL) { + if (fm->delete && (!error || !*error)) { /* not keep on server - just delete all the actual messages on the server */ for (i=0;i<folder_uids->len;i++) { d(printf("force delete uid '%s'\n", (gchar *)folder_uids->pdata[i])); @@ -309,7 +309,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m, } } - if ((fm->delete || cache_uids) && error == NULL) { + if ((fm->delete || cache_uids) && (!error || !*error)) { /* expunge messages (downloaded so far) */ /* FIXME Not passing a GCancellable or GError here. */ camel_folder_synchronize_sync ( |