diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 4 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment-bar.c | 9 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment.c | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index bd46df74a3..14a55ab116 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,5 +1,9 @@ 2001-01-02 Dan Winship <danw@helixcode.com> + * e-msg-composer-attachment.c (e_msg_composer_attachment_edit): + * e-msg-composer-attachment-bar.c (update): Use + header_content_type_simple, not header_content_type_format. + * e-msg-composer-hdrs.c (create_dropdown_entry): Call e_utf8_to_gtk_string on the combobox strings. diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index ebab16a971..d797f4aa4e 100644 --- a/composer/e-msg-composer-attachment-bar.c +++ b/composer/e-msg-composer-attachment-bar.c @@ -235,15 +235,13 @@ update (EMsgComposerAttachmentBar *bar) for (p = priv->attachments; p != NULL; p = p->next) { EMsgComposerAttachment *attachment; const gchar *desc; - gchar *size_string, *label, *mime_type; + gchar *size_string, *label; CamelContentType *content_type; GdkPixbuf *pixbuf; gboolean image; attachment = p->data; content_type = camel_mime_part_get_content_type (attachment->body); - mime_type = header_content_type_format (content_type); - /* Get the image out of the attachment and create a thumbnail for it */ image = header_content_type_is (content_type, "image", "*"); @@ -335,14 +333,17 @@ update (EMsgComposerAttachmentBar *bar) if (image) { e_icon_list_append_pixbuf (icon_list, attachment->pixbuf_cache, NULL, label); } else { + char *mime_type; + + mime_type = header_content_type_simple (content_type); pixbuf = pixbuf_for_mime_type (mime_type); + g_free (mime_type); e_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label); if (pixbuf) gdk_pixbuf_unref (pixbuf); } - g_free (mime_type); g_free (label); } diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c index 56a54877ce..75df63d2bd 100644 --- a/composer/e-msg-composer-attachment.c +++ b/composer/e-msg-composer-attachment.c @@ -399,7 +399,7 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, set_entry (editor_gui, "description_entry", camel_mime_part_get_description (attachment->body)); content_type = camel_mime_part_get_content_type (attachment->body); - type = header_content_type_format (content_type); + type = header_content_type_simple (content_type); set_entry (editor_gui, "mime_type_entry", type); g_free (type); } |