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 /calendar | |
| parent | 80dd512e6956502055657c1e00ab8feb2c9a3de9 (diff) | |
| download | gsoc2013-evolution-36321cbfdf47628a1c08a901c2978873bfdb87f7.tar.gz 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 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-cal-popup.c | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c5d7576e48..9b0b915d71 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2008-05-23 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #534476 + + * gui/e-cal-popup.c (ecalp_standard_menu_factory): + Remove the special check for "winmail.dat". GIO correctly + identifies it as "application/ms-tnef". + 2008-05-23 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #523402 diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index 050cf0df89..f3c9913715 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -403,16 +403,11 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data) 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); + 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); } } g_free (mime_type); |