From 36321cbfdf47628a1c08a901c2978873bfdb87f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 23 May 2008 14:41:30 +0000 Subject: ** Fixes bug #534476 2008-05-23 Matthew Barnes ** Fixes bug #534476 * configure.in: Require shared-mime-info >= 0.22 to make sure we pick up the fix for correctly identifying "winmail.dat" attachments. * calendar/gui/e-cal-popup.c (ecalp_standard_menu_factory): * mail/em-utils.c (em_utils_snoop_type): * mail/em-popup.c (emp_standard_menu_factory): Remove the special check for "winmail.dat". GIO correctly identifies it as "application/ms-tnef". svn path=/trunk/; revision=35534 --- mail/em-utils.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mail/em-utils.c') diff --git a/mail/em-utils.c b/mail/em-utils.c index efbfee34ea..799ff9c339 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -2209,13 +2209,8 @@ em_utils_snoop_type(CamelMimePart *part) CamelDataWrapper *dw; filename = camel_mime_part_get_filename (part); - if (filename) { - /* will GVFS misidentify TNEF attachments as MPEG? */ - if (!strcmp (filename, "winmail.dat")) - return "application/vnd.ms-tnef"; - + if (filename != NULL) name_type = e_util_guess_mime_type (filename); - } dw = camel_medium_get_content_object((CamelMedium *)part); if (!camel_data_wrapper_is_offline(dw)) { -- cgit v1.2.3