aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-display.c2
-rw-r--r--mail/mail-format.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 073a016148..5146dc2595 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-02 Dan Winship <danw@helixcode.com>
+
+ * mail-format.c (mail_part_is_inline):
+ (find_preferred_alternative):
+ * mail-display.c (launch_cb): Use header_content_type_simple, not
+ header_content_type_format.
+
2000-12-26 Jeffrey Stedfast <fejj@helixcode.com>
* mail-crypto.c (mail_crypto_openpgp_verify): Implemented.
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 46946bf6ab..a700a3c9d0 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -249,7 +249,7 @@ launch_cb (GtkWidget *widget, gpointer user_data)
char *mime_type, *tmpl, *tmpdir, *filename, *argv[2];
content_type = camel_mime_part_get_content_type (part);
- mime_type = header_content_type_format (content_type);
+ mime_type = header_content_type_simple (content_type);
app = gnome_vfs_mime_get_default_application (mime_type);
g_free (mime_type);
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 0cb1fb37ec..c7b6a14344 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -477,7 +477,7 @@ mail_part_is_inline (CamelMimePart *part)
/* Otherwise, display it inline if it's "anonymous", and
* as an attachment otherwise.
*/
- return is_anonymous (part, header_content_type_format (content_type));
+ return is_anonymous (part, header_content_type_simple (content_type));
}
static void
@@ -1327,7 +1327,7 @@ find_preferred_alternative (CamelMultipart *multipart, gboolean want_plain)
for (i = 0; i < nparts; i++) {
CamelMimePart *part = camel_multipart_get_part (multipart, i);
CamelContentType *type = camel_mime_part_get_content_type (part);
- char *mime_type = header_content_type_format (type);
+ char *mime_type = header_content_type_simple (type);
g_strdown (mime_type);
if (want_plain && !strcmp (mime_type, "text/plain"))