summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fr-command-7z.c15
-rw-r--r--src/fr-command-unarchiver.c3
-rw-r--r--src/fr-command-zip.c15
3 files changed, 28 insertions, 5 deletions
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index a41f97d..33e3b3b 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -588,13 +588,24 @@ const char *sevenz_mime_types[] = { "application/x-7z-compressed",
"application/x-ms-dos-executable",
"application/x-ms-wim",
"application/x-rar",
- "application/zip",
- NULL };
+ "application/zip", /* zip always at the end and the number of */
+ NULL }; /* place in fr_command_7z_get_mime_types */
static const char **
fr_command_7z_get_mime_types (FrCommand *comm)
{
+ GSettings *settings;
+ settings = g_settings_new ("org.mate.engrampa.general");
+
+ if (g_settings_get_boolean (settings, "unar-open-zip") &&
+ is_program_in_path ("unar") && is_program_in_path ("lsar"))
+ sevenz_mime_types [8] = NULL;
+ else
+ g_settings_set_boolean (settings, "unar-open-zip", FALSE);
+
+ g_object_unref (settings);
+
return sevenz_mime_types;
}
diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c
index 8e78dd2..fc5ed21 100644
--- a/src/fr-command-unarchiver.c
+++ b/src/fr-command-unarchiver.c
@@ -248,7 +248,8 @@ fr_command_unarchiver_handle_error (FrCommand *comm,
}
-const char *unarchiver_mime_type[] = { "application/x-cbr",
+const char *unarchiver_mime_type[] = { "application/zip",
+ "application/x-cbr",
"application/x-rar",
NULL };
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index a5326ba..387f27c 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -392,13 +392,24 @@ const char *zip_mime_type[] = {
"application/x-ear",
"application/x-ms-dos-executable",
"application/x-war",
- "application/zip",
- NULL };
+ "application/zip", /* zip always at the end and the number of */
+ NULL }; /* place in fr_command_zip_get_mime_types */
static const char **
fr_command_zip_get_mime_types (FrCommand *comm)
{
+ GSettings *settings;
+ settings = g_settings_new ("org.mate.engrampa.general");
+
+ if (g_settings_get_boolean (settings, "unar-open-zip") &&
+ is_program_in_path ("unar") && is_program_in_path ("lsar"))
+ zip_mime_type [10] = NULL;
+ else
+ g_settings_set_boolean (settings, "unar-open-zip", FALSE);
+
+ g_object_unref (settings);
+
return zip_mime_type;
}