[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdeutils/ark
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2005-08-06 22:43:42
Message-ID: 1123368222.469738.26902.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 443676 by mpyne:

Recognize the application/x-tbz2 mime type as a Bzip-2'ed tar file as well, for
some reason Ark was unable to make the connection.


 M  +1 -0      archiveformatinfo.cpp  
 M  +7 -0      tar.cpp  


--- branches/KDE/3.5/kdeutils/ark/archiveformatinfo.cpp #443675:443676
@@ -51,6 +51,7 @@
   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" );
   // x-tar as the last one to get its comment for all the others, too
   addFormatInfo( TAR_FORMAT, "application/x-tar", ".tar" );
 
--- branches/KDE/3.5/kdeutils/ark/tar.cpp #443675:443676
@@ -92,6 +92,13 @@
 
     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;
[prev in list] [next in list] [prev in thread] [next in thread]