From e14a0019e799ea6c91ca6320ab0ca6c3c89dc7b6 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 10 Aug 2005 02:04:31 +0000 Subject: ** See #312715. 2005-08-09 Not Zed ** See #312715. * em-folder-tree.c (emft_drop_folder_rec): removed. (emft_drop_folder): call em_folder_utils_copy_folders to perform the operation rather than: doing it sync when it shouldn't be, and 2; copying code redundantly. * em-folder-utils.c (em_folder_utils_move_folder): remove this redundant api. (em_folder_utils_copy_folder): add delete flag. (em_folder_utils_copy_folders): export this function. fix strange argument order. svn path=/trunk/; revision=30066 --- mail/mail-ops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/mail-ops.c') diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 57347b3f69..030fe8afc2 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -490,7 +490,7 @@ mail_send_message(CamelFolder *queue, const char *uid, const char *destination, tmp = camel_header_raw_find(&xev, "X-Evolution-Transport", NULL); if (tmp) transport_url = g_strstrip(g_strdup(tmp)); - + tmp = camel_header_raw_find(&xev, "X-Evolution-Fcc", NULL); if (tmp) sent_folder_uri = g_strstrip(g_strdup(tmp)); @@ -698,7 +698,7 @@ send_queue_send(struct _mail_msg *mm) if (!(uids = camel_folder_get_uids (m->queue))) return; - + send_uids = g_ptr_array_sized_new (uids->len); for (i = 0, j = 0; i < uids->len; i++) { CamelMessageInfo *info; @@ -765,10 +765,10 @@ send_queue_send(struct _mail_msg *mm) camel_object_unref (m->driver); m->driver = NULL; } - + camel_folder_free_uids (m->queue, uids); g_ptr_array_free (send_uids, TRUE); - + camel_folder_sync (m->queue, TRUE, &ex); camel_exception_clear (&ex); -- cgit v1.2.3