[file-roller] libarchive: don't do rar if there's unar



commit d6e998e3a81681e1093a88e5dec57a6a2594197f
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Aug 11 00:15:18 2015 +0200

    libarchive: don't do rar if there's unar
    
    The Unarchiver, unlike libarchive, supports RAR5.
    
    Libarchive ticket:
    https://github.com/libarchive/libarchive/issues/373

 src/fr-archive-libarchive.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
index 2b70528..28115e6 100644
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@ -137,12 +137,13 @@ fr_archive_libarchive_get_capabilities (FrArchive  *archive,
                return capabilities;
        }
 
-       /* give priority to rar and unrar that supports RAR files better. */
+       /* give priority to rar, unrar and that support RAR files better. */
        if ((strcmp (mime_type, "application/x-rar") == 0)
            || (strcmp (mime_type, "application/x-cbr") == 0))
        {
                if (_g_program_is_available ("rar", check_command)
-                   || _g_program_is_available ("unrar", check_command)) {
+                   || _g_program_is_available ("unrar", check_command)
+                   || _g_program_is_available ("unar", check_command)) {
                        return capabilities;
                }
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]