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 | |
| 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')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-popup.c | 19 | ||||
| -rw-r--r-- | mail/em-utils.c | 7 |
3 files changed, 17 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 30332e45bc..54d0d54365 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2008-05-23 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #534476 + + * em-utils.c (em_utils_snoop_type): + * em-popup.c (emp_standard_menu_factory): + Remove the special check for "winmail.dat". GIO correctly + identifies it as "application/ms-tnef". + 2008-05-23 Srinivasa Ragavan <sragavan@novell.com> * mail-mt.c: (mail_msg_check_error): Convert the the warning to a diff --git a/mail/em-popup.c b/mail/em-popup.c index b727bf552f..00c9bcbd1e 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -806,7 +806,7 @@ emp_standard_menu_factory(EPopup *emp, void *data) if (mime_type) { gchar *cp; - /* does gvfs expect lowercase MIME types? */ + /* GIO expects lowercase MIME types. */ for (cp = mime_type; *cp != '\0'; cp++) *cp = g_ascii_tolower (*cp); @@ -815,18 +815,13 @@ emp_standard_menu_factory(EPopup *emp, void *data) these two soon. */ apps = g_app_info_get_all_for_type (mime_type); - if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) { - if (filename) { - /* will gvfs misidentify TNEF attachments as MPEG? */ - if (!strcmp (filename, "winmail.dat")) - apps = g_app_info_get_all_for_type ("application/vnd.ms-tnef"); - else { - char *name_type = e_util_guess_mime_type (filename); + if (apps == NULL && strcmp (mime_type, "application/octet-stream") == 0) { + if (filename != NULL) { + gchar *name_type; - apps = g_app_info_get_all_for_type (name_type); - - g_free (name_type); - } + name_type = e_util_guess_mime_type (filename); + apps = g_app_info_get_all_for_type (name_type); + g_free (name_type); } } 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)) { |