aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-identify.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 361495e399..8c8a115156 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-15 Not Zed <NotZed@Ximian.com>
+
+ * mail-identify.c (mail_identify_mime_part): Turn off the code
+ which downloads the part if we can't identify it. See discussion
+ in #11778.
+
2002-04-17 Christopher James Lahey <clahey@ximian.com>
* folder-browser.c, mail-display.c: Updated these to match the new
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
index cc6e4ef9d0..21e3b6a0fd 100644
--- a/mail/mail-identify.c
+++ b/mail/mail-identify.c
@@ -97,13 +97,17 @@ mail_identify_mime_part (CamelMimePart *part, MailDisplay *md)
* would require a Mac type to mime type conversion table.
*/
+#if 0
/* If the data part is offline, then we didn't try magic
* before, so force it to be loaded so we can try again later.
* FIXME: In a perfect world, we would not load the content
* just to identify the MIME type.
*/
+ /* This is disabled as it just frustrates users more than it helps,
+ see discussion in bug #11778 */
if (camel_data_wrapper_is_offline (data))
mail_content_loaded (data, md, TRUE, NULL, NULL, NULL);
+#endif
return NULL;
}