diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-18 02:32:16 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-18 02:32:16 +0000 |
commit | 2abe1e6f4022109b1e179242aa9765810d7f680c (patch) | |
tree | 408f52f8bc6e4ae2a1c093439be5404fbbce56be /ark/rar.cpp | |
parent | 2bda8f7717adf28da4af0d34fb82f63d2868c31d (diff) | |
download | tdeutils-2abe1e6f4022109b1e179242aa9765810d7f680c.tar.gz tdeutils-2abe1e6f4022109b1e179242aa9765810d7f680c.zip |
* ark context un[tar/zip/bz] crash repair
* gcc4.4 compilation fixes
* superkaramba xmms sensor addition
* automake updates
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1063396 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ark/rar.cpp')
-rw-r--r-- | ark/rar.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ark/rar.cpp b/ark/rar.cpp index 592ffe2..742df1c 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -55,6 +55,8 @@ RarArch::RarArch( ArkWidget *_gui, const QString & _fileName ) { // Check if rar is available bool have_rar = !KGlobal::dirs()->findExe( "rar" ).isNull(); + bool have_unrar = !KGlobal::dirs()->findExe( "unrar" ).isNull(); + bool have_unrar_free = !KGlobal::dirs()->findExe( "unrar-free" ).isNull(); if ( have_rar ) { @@ -63,13 +65,20 @@ RarArch::RarArch( ArkWidget *_gui, const QString & _fileName ) verifyCompressUtilityIsAvailable( m_archiver_program ); verifyUncompressUtilityIsAvailable( m_unarchiver_program ); } - else + else if (have_unrar) { // If rar is not available, try to use unrar to open the archive read-only m_unarchiver_program = "unrar"; verifyUncompressUtilityIsAvailable( m_unarchiver_program ); setReadOnly( true ); } + else + { + // If rar is not available, try to use unrar to open the archive read-only + m_unarchiver_program = "unrar-free"; + verifyUncompressUtilityIsAvailable( m_unarchiver_program ); + setReadOnly( true ); + } |