diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-display.c | 2 | ||||
| -rw-r--r-- | mail/mail-format.c | 18 | ||||
| -rw-r--r-- | mail/mail-ops.c | 3 |
4 files changed, 18 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 771310c08a..280dbcddfe 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-07-20 Jeffrey Stedfast <fejj@ximian.com> + + * mail-ops.c (filter_folder_filter): Don't expunge the source + folder if we have a cache. + 2001-07-20 Dan Winship <danw@ximian.com> * mail-mt.c (mail_msgport_replied): Use mail_msg_destroy rather @@ -47,6 +52,7 @@ (destination_folder_handle_motion): Ditto. (destination_folder_handle_drop): Ditto. +>>>>>>> 1.1426 2001-07-19 Not Zed <NotZed@Ximian.com> * mail-local.c (reconfigure_folder_reconfigure): remvoed diff --git a/mail/mail-display.c b/mail/mail-display.c index ccc399b230..ea795fc6d2 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1194,7 +1194,7 @@ mail_display_redisplay (MailDisplay *md, gboolean unscroll) /* This is a hack until there's a clean way to do this. */ GTK_HTML (md->html)->engine->newPage = FALSE; } - + mail_html_write (md->html, md->stream, "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\">\n</head>\n"); mail_html_write (md->html, md->stream, "<body marginwidth=0 marginheight=0>\n"); diff --git a/mail/mail-format.c b/mail/mail-format.c index b5d28eafca..a5f4007b6d 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -153,9 +153,9 @@ void mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md) { GHashTable *urls; - + g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message)); - + urls = g_datalist_get_data (md->data, "part_urls"); if (!urls) { urls = g_hash_table_new (g_str_hash, g_str_equal); @@ -168,7 +168,7 @@ mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md) g_datalist_set_data_full (md->data, "data_urls", urls, free_data_urls); } - + /* ok, so they're not urls. so sue me. */ urls = g_datalist_get_data (md->data, "attachment_states"); if (!urls) { @@ -176,7 +176,7 @@ mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md) g_datalist_set_data_full (md->data, "attachment_states", urls, (GDestroyNotify) g_hash_table_destroy); } - + write_headers (mime_message, md); format_mime_part (CAMEL_MIME_PART (mime_message), md); } @@ -875,7 +875,7 @@ write_headers (CamelMimeMessage *message, MailDisplay *md) }; int i, len, flags; gboolean full = (md->display_style == MAIL_CONFIG_DISPLAY_FULL_HEADERS); - + mail_html_write (md->html, md->stream, "<table width=\"100%%\" cellpadding=0 cellspacing=0>" "<tr><td colspan=3 height=10><table height=10 cellpadding=0 cellspacing=0>" @@ -886,7 +886,7 @@ write_headers (CamelMimeMessage *message, MailDisplay *md) "cellspacing=0 cellpadding=1><tr><td>" "<table bgcolor=\"#EEEEEE\" width=\"100%%\" cellpadding=0 cellspacing=0>" "<tr><td><table>\n"); - + if (full) { gheaders = camel_medium_get_headers (CAMEL_MEDIUM (message)); headers = (CamelMediumHeader *)gheaders->data; @@ -898,13 +898,13 @@ write_headers (CamelMimeMessage *message, MailDisplay *md) len = sizeof (default_headers) / sizeof (default_headers[0]); flags = 0; } - + for (i = 0; i < len; i++) write_header (message, md, headers[i].name, headers[i].value, flags); - + if (gheaders) camel_medium_free_headers (CAMEL_MEDIUM (message), gheaders); - + mail_html_write (md->html, md->stream, "</table></td></tr></table></td></tr></table></font></td>" "<td><table width=10 cellpadding=0 cellspacing=0><tr><td></td></tr></table></td></tr>" diff --git a/mail/mail-ops.c b/mail/mail-ops.c index e296dec074..0a4e21160e 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -116,7 +116,8 @@ filter_folder_filter (struct _mail_msg *mm) camel_folder_free_uids (folder, folder_uids); /* sync and expunge */ - camel_folder_sync (folder, TRUE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex); + if (!m->cache) + camel_folder_sync (folder, TRUE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex); camel_folder_thaw (folder); if (m->destination) |