callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if gnome-vfs returns application/octet-stream with the magic check, use

Browse Source 
2001-10-01  Larry Ewing  <lewing@ximian.com>

	* mail-identify.c (mail_identify_mime_part): if gnome-vfs returns
	application/octet-stream with the magic check, use the filename
	check instead since it at least has a chance of being useful.

svn path=/trunk/; revision=13265
This commit is contained in:
Larry Ewing
2001-10-01 18:23:05 +00:00
committed by Larry Ewing
parent 0b2cc6633c
commit da449e4dac
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mail/ChangeLog
View File

@ -1,3 +1,9 @@
2001-10-01 Larry Ewing <lewing@ximian.com>
* mail-identify.c (mail_identify_mime_part): if gnome-vfs returns
application/octet-stream with the magic check, use the filename
check instead since it at least has a chance of being useful.
2001-09-28 Dan Winship <danw@ximian.com>
* folder-browser-ui.c (fbui_sensitize_timeout): wrap a

22
mail/mail-identify.c
View File

@ -66,13 +66,21 @@ mail_identify_mime_part (CamelMimePart *part, MailDisplay *md)
if (!camel_data_wrapper_is_offline (data))
magic_type = identify_by_magic (data, md);
/* If GNOME-VFS doesn't recognize the data by magic, but it
* contains English words, it will call it text/plain. If the
* filename-based check came up with something different, use
* that instead.
*/
if (magic_type && name_type && !strcmp (magic_type, "text/plain"))
return g_strdup (name_type);
if (magic_type && name_type) {
/* If GNOME-VFS doesn't recognize the data by magic, but it
* contains English words, it will call it text/plain. If the
* filename-based check came up with something different, use
* that instead.
*/
if (!strcmp (magic_type, "text/plain"))
return g_strdup (name_type);
/* If if returns "application/octet-stream" try to
* do better with the filename check.
*/
if (!strcmp (magic_type, "application/octet-stream"))
return g_strdup (name_type);
}
/* If the MIME part data was online, and the magic check
* returned something, use that, since it's more reliable.