From 7cdaac30f5b4aa1d38a7e003963df3fc48576537 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 21 Aug 2010 23:42:39 +0000 Subject: Fixed the majority of the xz and lzma handling code There may still be an issue with the compress as menu and tar.lzma support, however it is relatively minor git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1166484 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ark/tar.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'ark/tar.cpp') 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(); } -- cgit v1.2.1