diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-10-01 20:29:46 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-10-01 20:29:46 +0800 |
| commit | 77ff19dd8394167cdc9765af20a62bdaed18e308 (patch) | |
| tree | cbc6da9a817aad2d87acab9199a37a69a08851bf /mail/em-utils.c | |
| parent | 11fd4c56d352e7e25cd95cf083b071e982cf42ba (diff) | |
| download | gsoc2013-evolution-77ff19dd8394167cdc9765af20a62bdaed18e308.tar.gz gsoc2013-evolution-77ff19dd8394167cdc9765af20a62bdaed18e308.tar.zst gsoc2013-evolution-77ff19dd8394167cdc9765af20a62bdaed18e308.zip | |
** Fix for bug #554418
2008-10-01 Milan Crha <mcrha@redhat.com>
** 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
Diffstat (limited to 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) { |