From a744dcdb0bfa90d730b173e3ffe818cd81506b9f Mon Sep 17 00:00:00 2001
From: Suman Manjunath <msuman@src.gnome.org>
Date: Thu, 7 Feb 2008 10:40:15 +0000
Subject: Patch from Paul Bolle  <pebolle@tiscali.nl>: Fix for bug #514736
 (Added 'application/ms-tnef' MIME type for TNEF attachment decoding)

svn path=/trunk/; revision=34970
---
 plugins/tnef-attachments/ChangeLog                            | 7 +++++++
 plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
index d0b0826d00..040e788d7a 100644
--- a/plugins/tnef-attachments/ChangeLog
+++ b/plugins/tnef-attachments/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #514736
+
+	* org-gnome-tnef-attachments.eplug.xml: Added 'application/ms-tnef' 
+	MIME type for TNEF attachment decoding. 
+
 2008-02-07  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fix for bug #514771
diff --git a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
index a207077d6a..73f94fa2d6 100644
--- a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+++ b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
@@ -12,10 +12,14 @@
       <group id="EMFormatHTML">
 	<item flags="inline_disposition" mime_type="application/vnd.ms-tnef"
 	  format="org_gnome_format_tnef"/>
+	<item flags="inline_disposition" mime_type="application/ms-tnef"
+	  format="org_gnome_format_tnef"/>
       </group>
       <group id="EMFormatHTMLDisplay">
 	<item flags="inline_disposition" mime_type="application/vnd.ms-tnef"
 	  format="org_gnome_format_tnef"/>
+	<item flags="inline_disposition" mime_type="application/ms-tnef"
+	  format="org_gnome_format_tnef"/>
       </group>
     </hook>
   </e-plugin>
-- 
cgit v1.2.3