summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2017-11-25 09:49:52 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2017-11-25 09:49:52 (GMT)
commit96765e0aa27a58e8747b8f867713fd1cc45c19b4 (patch)
tree29399d946f0f7e7772971e3d66a61acec3521c98
parent33fb502e420c40e3b85c24fcb350f9a7f194ac39 (diff)
downloadtdeutils-96765e0a.zip
tdeutils-96765e0a.tar.gz
Removed non existent application/x-tbz2 mimetype. This relates to bug 2043.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--ark/archiveformatinfo.cpp1
-rw-r--r--ark/ark.desktop2
-rw-r--r--ark/ark_part.desktop2
-rw-r--r--ark/tar.cpp7
-rw-r--r--superkaramba/src/sknewstuff.cpp1
5 files changed, 2 insertions, 11 deletions
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;
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 0316b80..c6869b3 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -64,7 +64,6 @@ bool SKNewStuff::install( const TQString &fileName )
result->name() == "application/x-bzip" ||
result->name() == "application/x-bzip2" ||
result->name() == "application/x-tbz" ||
- result->name() == "application/x-tbz2" ||
result->name() == "application/x-tar" ||
result->name() == "application/x-tarz")
{