d93c79add4
- Remove patch for RH bug #215467 (fixed upstream). - Remove patch for GNOME bug #499920 (fixed upstream).
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
--- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400
|
|
+++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400
|
|
@@ -2176,10 +2176,22 @@
|
|
* try to do better with the filename check.
|
|
*/
|
|
|
|
+ /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal:
|
|
+ * So many file types come compressed by gzip
|
|
+ * that extensions are more reliable than magic
|
|
+ * typing. If the file has a suffix, then use
|
|
+ * the type from the suffix:
|
|
+ */
|
|
if (magic_type) {
|
|
if (name_type
|
|
&& (!strcmp(magic_type, "text/plain")
|
|
- || !strcmp(magic_type, "application/octet-stream")))
|
|
+ || !strcmp(magic_type, "application/octet-stream")
|
|
+ || !strcmp(magic_type, "application/octet-stream")
|
|
+ || !strcmp(magic_type, "application/x-ole-storage")
|
|
+ || !strcmp(magic_type, "text/xml")
|
|
+ || !strcmp(magic_type, "application/x-bzip")
|
|
+ || !strcmp(magic_type, "application/x-gzip")
|
|
+ || !strcmp(magic_type, "application/zip")))
|
|
return name_type;
|
|
else
|
|
return magic_type;
|