** 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

1 files changed, 1 insertions, 1 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f4ecb85f24..0f3a62cfe8 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2843,7 +2843,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
 			return;
 		}
 
-		mime_type = e_util_guess_mime_type (file_name);
+		mime_type = e_util_guess_mime_type (file_name, TRUE);
 		if (mime_type) {
 			if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
 				wrapper = (CamelDataWrapper *) camel_mime_message_new ();