summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2007-06-27 17:57:01 +0000
committerChristian Neumair <cneumair@gnome.org>2007-06-27 17:57:01 +0000
commit6b5be55c79f1bdc4634cc7e8403d5aed05f614e5 (patch)
tree39c7ea30b4e194104a4410bb297c60cbf5a316d3
parent4a3758b4f4d7011cd5e9a8571ea65a9d20c2c225 (diff)
downloadshared-mime-info-6b5be55c79f1bdc4634cc7e8403d5aed05f614e5.tar.gz
2007-06-27 Christian Neumair <cneumair@gnome.org>
* freedesktop.org.xml.in: Fix WMF description and add matchlet, add EMF MIME type. Fixes #11385 and 11388. Thanks to Shaun Oldale <soldale@gmail.com>. Also fix OpenOffice Calc template description.
-rw-r--r--ChangeLog7
-rw-r--r--freedesktop.org.xml.in32
2 files changed, 37 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b325dba1..0bb3e6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-27 Christian Neumair <cneumair@gnome.org>
+
+ * freedesktop.org.xml.in: Fix WMF description and add matchlet, add
+ EMF MIME type. Fixes #11385 and 11388. Thanks to Shaun Oldale
+ <soldale@gmail.com>.
+ Also fix OpenOffice Calc template description.
+
2007-06-26 Christian Neumair <cneumair@gnome.org>
* freedesktop.org.xml.in: Add MP2 audio, add more aliases for 3GPP, fixes
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 51902371..e4175cf5 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -449,7 +449,7 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc.template">
<sub-class-of type="application/zip"/>
- <_comment>OpenOffice Calc spreadsheet template</_comment>
+ <_comment>OpenOffice Calc template</_comment>
<magic>
<match type="string" value="PK\003\004" offset="0">
<match type="string" value="mimetype" offset="30">
@@ -3056,10 +3056,38 @@ command to generate the output files.
<_comment>Windows cursor</_comment>
<glob pattern="*.cur"/>
</mime-type>
+ <mime-type type="image/x-emf">
+ <_comment>EMF document</_comment>
+ <acronym>EMF</acronym>
+ <expanded-acronym>Enhanced MetaFile</expanded-acronym>
+ <glob pattern="*.emf"/>
+ <magic priority="50">
+ <match type="little32" offset="0" value="0x00000001">
+ <match type="little32" offset="40" value="0x464D4520">
+ <match type="little32" offset="44" value="0x00010000">
+ <match type="little16" offset="58" value="0x0000"/>
+ </match>
+ </match>
+ </match>
+ </magic>
+ </mime-type>
<mime-type type="image/x-wmf">
<_comment>WMF document</_comment>
<acronym>WMF</acronym>
- <expanded-acronym>Windows Media Format</expanded-acronym>
+ <expanded-acronym>Windows Metafile</expanded-acronym>
+ <magic priority="50">
+ <!-- Placeable Metafile Header !-->
+ <match type="little32" offset="0" value="0x9AC6CDD7">
+ <!-- Followed by the standard Windows Metafile Header !-->
+ <match type="little16" offset="22" value="0x0001">
+ <match type="little16" offset="24" value="0x0009"/>
+ </match>
+ </match>
+ <!-- or just the standard Windows Metafile Header !-->
+ <match type="little16" offset="0" value="0x0001">
+ <match type="little16" offset="2" value="0x0009"/>
+ </match>
+ </magic>
<glob pattern="*.wmf"/>
</mime-type>
<mime-type type="image/x-xbitmap">