diff options
| author | Vincent Untz <vuntz@gnome.org> | 2011-10-19 09:49:36 +0200 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2011-10-19 11:16:44 +0200 |
| commit | 858a1244a12e30b6bd5e92fffc05838d3e3d4969 (patch) | |
| tree | 585fc6a447f4e76077faa409f8e37c8e4c390c9c | |
| parent | 987dd40f9633d517a3894d48ef2fd909a96d93f4 (diff) | |
| download | desktop-file-utils-858a1244a12e30b6bd5e92fffc05838d3e3d4969.tar.gz | |
Mark all zz-application/* MIME types as aliases
Even popular zz-application/* MIME types (like
zz-application/zz-winassoc-doc) should actually just be used as aliases
to the real valid MIME types.
This needs some fixes to shared-mime-info so that it knows about the
aliases, but it's the right thing to do.
| -rw-r--r-- | src/mimeutils.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/mimeutils.c b/src/mimeutils.c index 003e71e..87c41a5 100644 --- a/src/mimeutils.c +++ b/src/mimeutils.c @@ -73,27 +73,25 @@ static const char *valid_exceptions_mime_types[] = { "message/rfc822", /* some multimedia mime type; it clearly doesn't respect the mime type rules, * but it's widely deployed */ - "misc/ultravox", - /* zz-application is not a valid media type, but these mime types are widely - * used, so some applications claim them for interoperability */ - "zz-application/zz-winassoc-doc", - "zz-application/zz-winassoc-xls", + "misc/ultravox" }; static struct { const char *mime_type; const char *should_be; } alias_to_replace_mime_types[] = { - { "flv-application/octet-stream", "video/x-flv" }, - { "zz-application/zz-winassoc-123", "application/vnd.lotus-1-2-3" }, - { "zz-application/zz-winassoc-cab", "application/vnd.ms-cab-compressed" }, + { "flv-application/octet-stream", "video/x-flv" }, + { "zz-application/zz-winassoc-123", "application/vnd.lotus-1-2-3" }, /* alias to be added in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41989 */ + { "zz-application/zz-winassoc-cab", "application/vnd.ms-cab-compressed" }, /* alias to be added in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41989 */ { "zz-application/zz-winassoc-cdr", "application/vnd.corel-draw" }, - { "zz-application/zz-winassoc-hlp", "application/winhlp" }, + { "zz-application/zz-winassoc-doc", "application/vnd.ms-word" } /* alias to be added in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41989 */ + { "zz-application/zz-winassoc-hlp", "application/winhlp" }, /* not yet in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41708 */ { "zz-application/zz-winassoc-ini", "text/plain" }, - { "zz-application/zz-winassoc-lwp", "application/vnd.lotus-wordpro" }, - { "zz-application/zz-winassoc-lzh", "application/x-lzh-compressed" }, - { "zz-application/zz-winassoc-mdb", "application/x-msaccess" }, - { "zz-application/zz-winassoc-uu", "text/x-uuencode" }, + { "zz-application/zz-winassoc-lwp", "application/vnd.lotus-wordpro" }, /* not yet in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=36036 */ + { "zz-application/zz-winassoc-lzh", "application/x-lzh-compressed" }, /* not yet in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41680 */ + { "zz-application/zz-winassoc-mdb", "application/vnd.ms-access" }, /* alias to be added in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41989 */ + { "zz-application/zz-winassoc-uu", "text/x-uuencode" }, /* not yet in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41684 */ + { "zz-application/zz-winassoc-xls", "application/vnd.ms-excel" } /* alias to be added in shared-mime-info: https://bugs.freedesktop.org/show_bug.cgi?id=41989 */ }; #define IF_IS_IN(list, type) \ |