summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian James <[email protected]>2017-11-25 19:00:07 +0900
committerMichele Calgaro <[email protected]>2017-11-25 19:09:53 +0900
commit8621eda975d15332a50a95d2576cd5f8bfbefebe (patch)
tree0c2fa7e643db5397a773778ff0c3843f4866a640
parent6d51630c3f30d8c15958de698781cdf26edde7c0 (diff)
downloadtdeaddons-8621eda975d15332a50a95d2576cd5f8bfbefebe.tar.gz
tdeaddons-8621eda975d15332a50a95d2576cd5f8bfbefebe.zip
Applied patch from Brian James which fixes the problems of ark plugin
handling .tar.bz2 extract options. Thanks Brian James!! Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 33b03b13d6916cd48e5e079cba10fd0c33da87a6)
-rw-r--r--konq-plugins/arkplugin/arkplugin.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 091635d..7410ced 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -304,10 +304,7 @@ void ArkMenu::compMimeTypes()
if ( havegz )
m_archiveMimeTypes << "application/x-tgz";
if ( havebz2 )
- {
m_archiveMimeTypes << "application/x-tbz";
- m_archiveMimeTypes << "application/x-tbz2";
- }
if ( havelzop )
m_archiveMimeTypes << "application/x-tzo";
if ( havelzma )
@@ -358,7 +355,7 @@ void ArkMenu::extMimeTypes()
{
havegz = true;
m_extractMimeTypes << "application/x-gzip";
- m_extractMimeTypes << "application/x-gzpostscript";
+ m_extractMimeTypes << "application/x-gzpostscript";
}
bool havebz2 = false;
@@ -379,14 +376,14 @@ void ArkMenu::extMimeTypes()
if ( !TDEStandardDirs::findExe( "lzma" ).isNull() )
{
havelzma = true;
- m_archiveMimeTypes << "application/x-lzma";
+ m_extractMimeTypes << "application/x-lzma";
}
bool havexz = false;
if ( !TDEStandardDirs::findExe( "xz" ).isNull() )
{
havexz = true;
- m_archiveMimeTypes << "application/x-xz";
+ m_extractMimeTypes << "application/x-xz";
}
if ( !TDEStandardDirs::findExe( "tar" ).isNull() )
@@ -395,10 +392,7 @@ void ArkMenu::extMimeTypes()
if ( havegz )
m_extractMimeTypes << "application/x-tgz";
if ( havebz2 )
- {
m_extractMimeTypes << "application/x-tbz";
- m_extractMimeTypes << "application/x-tbz2";
- }
if ( havelzop )
m_extractMimeTypes << "application/x-tzo";
if ( havelzma )