summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ark/ark.desktop2
-rw-r--r--ark/ark_part.desktop2
-rw-r--r--ark/tar.cpp17
3 files changed, 12 insertions, 9 deletions
diff --git a/ark/ark.desktop b/ark/ark.desktop
index 1e6b4db..25f1fd9 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
+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
GenericName=Archiving Tool
GenericName[af]=Argiveer Program
GenericName[ar]=أداة أرشفة
diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop
index a531d9d..f09a772 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
+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
Comment=Archive Handling Tool
Comment[af]=Argief Handtering Program
Comment[ar]=أداة التعامل مع الملفات المضغوطة
diff --git a/ark/tar.cpp b/ark/tar.cpp
index e3be8b0..7de54f9 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -208,10 +208,10 @@ TQString TarArch::getCompressor()
if ( m_fileMimeType == "application/x-tbz" )
return TQString( "bzip2" );
- if ( m_fileMimeType == "application/x-lzma" )
+ if ( m_fileMimeType == "application/x-tlz" )
return TQString( "lzma" );
- if ( m_fileMimeType == "application/x-xz" )
+ if ( m_fileMimeType == "application/x-txz" )
return TQString( "xz" );
if( m_fileMimeType == "application/x-tzo" )
@@ -232,10 +232,10 @@ TQString TarArch::getUnCompressor()
if ( m_fileMimeType == "application/x-tbz" )
return TQString( "bunzip2" );
- if ( m_fileMimeType == "application/x-lzma" )
+ if ( m_fileMimeType == "application/x-tlz" )
return TQString( "unlzma" );
- if ( m_fileMimeType == "application/x-xz" )
+ if ( m_fileMimeType == "application/x-txz" )
return TQString( "unxz" );
if( m_fileMimeType == "application/x-tzo" )
@@ -305,10 +305,13 @@ void TarArch::openFirstCreateTempDone()
&& ( m_fileMimeType != "application/x-tbz" ) )
{
disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) );
+ Q_ASSERT( !m_listingThread );
+ m_listingThread = new TarListingThread( this, tmpfile );
+ }
+ else {
+ Q_ASSERT( !m_listingThread );
+ m_listingThread = new TarListingThread( this, m_filename );
}
-
- Q_ASSERT( !m_listingThread );
- m_listingThread = new TarListingThread( this, m_filename );
m_listingThread->start();
}