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 <michele.calgaro@yahoo.it>
(cherry picked from commit 33b03b13d6)
r14.0.x
Brian James 7 years ago committed by Michele Calgaro
parent 6d51630c3f
commit 8621eda975

@ -304,10 +304,7 @@ void ArkMenu::compMimeTypes()
if ( havegz ) if ( havegz )
m_archiveMimeTypes << "application/x-tgz"; m_archiveMimeTypes << "application/x-tgz";
if ( havebz2 ) if ( havebz2 )
{
m_archiveMimeTypes << "application/x-tbz"; m_archiveMimeTypes << "application/x-tbz";
m_archiveMimeTypes << "application/x-tbz2";
}
if ( havelzop ) if ( havelzop )
m_archiveMimeTypes << "application/x-tzo"; m_archiveMimeTypes << "application/x-tzo";
if ( havelzma ) if ( havelzma )
@ -358,7 +355,7 @@ void ArkMenu::extMimeTypes()
{ {
havegz = true; havegz = true;
m_extractMimeTypes << "application/x-gzip"; m_extractMimeTypes << "application/x-gzip";
m_extractMimeTypes << "application/x-gzpostscript"; m_extractMimeTypes << "application/x-gzpostscript";
} }
bool havebz2 = false; bool havebz2 = false;
@ -379,14 +376,14 @@ void ArkMenu::extMimeTypes()
if ( !TDEStandardDirs::findExe( "lzma" ).isNull() ) if ( !TDEStandardDirs::findExe( "lzma" ).isNull() )
{ {
havelzma = true; havelzma = true;
m_archiveMimeTypes << "application/x-lzma"; m_extractMimeTypes << "application/x-lzma";
} }
bool havexz = false; bool havexz = false;
if ( !TDEStandardDirs::findExe( "xz" ).isNull() ) if ( !TDEStandardDirs::findExe( "xz" ).isNull() )
{ {
havexz = true; havexz = true;
m_archiveMimeTypes << "application/x-xz"; m_extractMimeTypes << "application/x-xz";
} }
if ( !TDEStandardDirs::findExe( "tar" ).isNull() ) if ( !TDEStandardDirs::findExe( "tar" ).isNull() )
@ -395,10 +392,7 @@ void ArkMenu::extMimeTypes()
if ( havegz ) if ( havegz )
m_extractMimeTypes << "application/x-tgz"; m_extractMimeTypes << "application/x-tgz";
if ( havebz2 ) if ( havebz2 )
{
m_extractMimeTypes << "application/x-tbz"; m_extractMimeTypes << "application/x-tbz";
m_extractMimeTypes << "application/x-tbz2";
}
if ( havelzop ) if ( havelzop )
m_extractMimeTypes << "application/x-tzo"; m_extractMimeTypes << "application/x-tzo";
if ( havelzma ) if ( havelzma )

Loading…
Cancel
Save