From 77ff19dd8394167cdc9765af20a62bdaed18e308 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 1 Oct 2008 12:29:46 +0000 Subject: ** Fix for bug #554418 2008-10-01 Milan Crha ** Fix for bug #554418 * e-util/e-util.h: (e_util_guess_mime_type): * e-util/e-util.c: (e_util_guess_mime_type): Guess mime_type based on the file content only when permitted by the caller, otherwise check based on the filename only, where it fallbacks if file content guess fails. * mail/em-utils.c: (em_utils_snoop_type): * mail/em-popup.c: (emp_standard_menu_factory): Guess mime_type based on the filename only. * composer/e-msg-composer.c: (handle_uri), (e_msg_composer_add_inline_image_from_file): Guess mime_type based on the file content, if failed, then on the filename. * widgets/misc/e-attachment.c: (attachment_guess_mime_type): Allow guessing mime_type based on the file content. * calendar/gui/dialogs/comp-editor.c: (set_attachment_list): * calendar/gui/e-cal-popup.c: (ecalp_standard_menu_factory): Allow/disallow guessing of the mime_type based on the file content. svn path=/trunk/; revision=36529 --- mail/ChangeLog | 8 ++++++++ mail/em-popup.c | 2 +- mail/em-utils.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 7ecbee7885..d8d68f1a4a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-10-01 Milan Crha + + ** Part of fix for bug #554418 + + * em-utils.c: (em_utils_snoop_type): + * em-popup.c: (emp_standard_menu_factory): + Guess mime_type based on the filename only. + 2008-10-01 Milan Crha ** Fix for bug #554458 diff --git a/mail/em-popup.c b/mail/em-popup.c index b05e7753c3..dfd09d2ad0 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -807,7 +807,7 @@ emp_standard_menu_factory(EPopup *emp, void *data) if (filename != NULL) { gchar *name_type; - name_type = e_util_guess_mime_type (filename); + name_type = e_util_guess_mime_type (filename, FALSE); cp = g_content_type_from_mime_type (name_type); apps = g_app_info_get_all_for_type (cp ? cp : name_type); g_free (cp); diff --git a/mail/em-utils.c b/mail/em-utils.c index f7555afbef..01b18eb461 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -2260,7 +2260,7 @@ em_utils_snoop_type(CamelMimePart *part) filename = camel_mime_part_get_filename (part); if (filename != NULL) - name_type = e_util_guess_mime_type (filename); + name_type = e_util_guess_mime_type (filename, FALSE); dw = camel_medium_get_content_object((CamelMedium *)part); if (!camel_data_wrapper_is_offline(dw)) { -- cgit