From e2a62bdbfbe2ddfb9a3ffc37a9bfba158767480e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 25 Nov 2017 18:49:52 +0900 Subject: Removed non existent application/x-tbz2 mimetype. This relates to bug 2043. Signed-off-by: Michele Calgaro (cherry picked from commit 96765e0aa27a58e8747b8f867713fd1cc45c19b4) --- ark/archiveformatinfo.cpp | 1 - ark/ark.desktop | 2 +- ark/ark_part.desktop | 2 +- ark/tar.cpp | 7 ------- 4 files changed, 2 insertions(+), 10 deletions(-) (limited to 'ark') diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index 1cff881..31448b4 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -52,7 +52,6 @@ void ArchiveFormatInfo::buildFormatInfos() addFormatInfo( TAR_FORMAT, "application/x-tzo", ".tar.lzo" ); addFormatInfo( TAR_FORMAT, "application/x-tarz", ".tar.z" ); addFormatInfo( TAR_FORMAT, "application/x-tbz", ".tar.bz2" ); - addFormatInfo( TAR_FORMAT, "application/x-tbz2", ".tar.bz2" ); addFormatInfo( TAR_FORMAT, "application/x-tlz", ".tar.lzma" ); addFormatInfo( TAR_FORMAT, "application/x-txz", ".tar.xz" ); diff --git a/ark/ark.desktop b/ark/ark.desktop index f0e233c..ab4f83b 100644 --- a/ark/ark.desktop +++ b/ark/ark.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz +MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz GenericName=Archiving Tool GenericName[af]=Argiveer Program GenericName[ar]=أداة أرشفة diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop index a736b82..c455f7e 100644 --- a/ark/ark_part.desktop +++ b/ark/ark_part.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-tlz;application/x-txz +MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-tlz;application/x-txz Comment=Archive Handling Tool Comment[af]=Argief Handtering Program Comment[ar]=أداة التعامل مع الملفات المضغوطة diff --git a/ark/tar.cpp b/ark/tar.cpp index 10bf55f..cd8acee 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -91,13 +91,6 @@ TarArch::TarArch( ArkWidget *_gui, kdDebug(1601) << "TarArch::TarArch: mimetype is " << m_fileMimeType << endl; - if ( m_fileMimeType == "application/x-tbz2" ) - { - // ark treats .tar.bz2 as x-tbz, instead of duplicating the mimetype - // let's just alias it to the one we already handle. - m_fileMimeType = "application/x-tbz"; - } - if ( m_fileMimeType == "application/x-tar" ) { compressed = false; -- cgit v1.2.1