[file-roller] Fixed opening of cab files
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [file-roller] Fixed opening of cab files
- Date: Sat, 15 Aug 2009 09:14:04 +0000 (UTC)
commit 0ba75c9aec98a0b9cd28476660d94f59f6e89d3c
Author: William Jon McCann <william jon mccann gmail com>
Date: Sat Aug 15 11:10:56 2009 +0200
Fixed opening of cab files
[fixed bug #591868]
nautilus/nautilus-fileroller.c | 2 +-
src/fr-command-7z.c | 4 ++--
src/main.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
index e467e17..d67b69e 100644
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@ -151,7 +151,7 @@ static char *mime_types[] = {
"application/x-bzip-compressed-tar",
"application/x-bzip1",
"application/x-bzip1-compressed-tar",
- "application/x-cabinet",
+ "application/vnd.ms-cab-compressed",
"application/x-cbr",
"application/x-cbz",
"application/x-cd-image",
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index b24cbd5..139efbe 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -512,7 +512,7 @@ fr_command_7z_handle_error (FrCommand *comm,
const char *sevenz_mime_types[] = { "application/x-7z-compressed",
"application/x-arj",
- "application/x-cabinet",
+ "application/vnd.ms-cab-compressed",
"application/x-cd-image",
/*"application/x-cbr",*/
"application/x-cbz",
@@ -545,7 +545,7 @@ fr_command_7z_get_capabilities (FrCommand *comm,
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;
}
- else if (is_program_in_path ("7z")) {
+ else if (is_program_in_path ("7z") || is_program_in_path ("7za")) {
if (is_mime_type (mime_type, "application/x-rar")
|| is_mime_type (mime_type, "application/x-cbr"))
{
diff --git a/src/main.c b/src/main.c
index 0981a23..16cd83b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -88,7 +88,7 @@ FrMimeTypeDescription mime_type_desc[] = {
{ "application/x-bzip-compressed-tar", ".tar.bz2", N_("Tar compressed with bzip2 (.tar.bz2)"), 0 },
{ "application/x-bzip1", ".bz", NULL, 0 },
{ "application/x-bzip1-compressed-tar", ".tar.bz", N_("Tar compressed with bzip (.tar.bz)"), 0 },
- { "application/x-cabinet", ".cab", N_("Cabinet (.cab)"), 0 },
+ { "application/vnd.ms-cab-compressed", ".cab", N_("Cabinet (.cab)"), 0 },
{ "application/x-cbr", ".cbr", N_("Rar Archived Comic Book (.cbr)"), 0 },
{ "application/x-cbz", ".cbz", N_("Zip Archived Comic Book (.cbz)"), 0 },
{ "application/x-cd-image", ".iso", NULL, 0 },
@@ -130,7 +130,7 @@ FrExtensionType file_ext_type[] = {
{ ".bin", "application/x-stuffit" },
{ ".bz", "application/x-bzip" },
{ ".bz2", "application/x-bzip" },
- { ".cab", "application/x-cabinet" },
+ { ".cab", "application/vnd.ms-cab-compressed" },
{ ".cbr", "application/x-cbr" },
{ ".cbz", "application/x-cbz" },
{ ".cpio", "application/x-cpio" },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]