[file-roller] 7zip: do not allow to specify a password if only 7zr is installed



commit 8b88a76a66294611d536415988a6f4d70d5d9342
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Aug 26 11:19:09 2010 +0200

    7zip: do not allow to specify a password if only 7zr is installed
    
    The 7zr command does not support encryption.
    
    [bug #618908]

 src/fr-command-7z.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index a5460d7..76fe48d 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -550,10 +550,14 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
 		return capabilities;
 
 	if (is_mime_type (mime_type, "application/x-7z-compressed")) {
-		capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER | FR_COMMAND_CAN_CREATE_VOLUMES;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_CREATE_VOLUMES;
+		if (is_program_available ("7z", check_command))
+			capabilities |= FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER;
 	}
 	else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) {
-		capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER | FR_COMMAND_CAN_CREATE_VOLUMES;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
+		if (is_program_available ("7z", check_command))
+			capabilities |= FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER;
 	}
 	else if (is_program_available ("7z", check_command)) {
 		if (is_mime_type (mime_type, "application/x-rar")



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