diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-05-23 22:41:30 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-05-23 22:41:30 +0800 |
| commit | 36321cbfdf47628a1c08a901c2978873bfdb87f7 (patch) | |
| tree | 3c155d34e5b63b8ca7672291641797388086101b /mail/em-utils.c | |
| parent | 80dd512e6956502055657c1e00ab8feb2c9a3de9 (diff) | |
| download | gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar.gz gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar.bz2 gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar.lz gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar.xz gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar.zst gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.zip | |
** Fixes bug #534476
2008-05-23 Matthew Barnes <mbarnes@redhat.com>
** 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
Diffstat (limited to 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 7 |
1 files changed, 1 insertions, 6 deletions
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)) { |