[file-roller] re-use the same extraction options after asking for a password
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] re-use the same extraction options after asking for a password
- Date: Sun, 20 Dec 2015 12:17:52 +0000 (UTC)
commit b67530a172f5e63ba69f7350f3cab271e1b460d6
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Dec 20 13:10:11 2015 +0100
re-use the same extraction options after asking for a password
src/dlg-extract.c | 35 +++++++++++++-----
src/fr-window.c | 105 +++++++++++++++++++++++++++++++++--------------------
src/fr-window.h | 22 ++++++++++--
3 files changed, 110 insertions(+), 52 deletions(-)
---
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index f140cc1..e49f0c4 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -175,7 +175,7 @@ extract_cb (GtkWidget *w,
return FALSE;
}
- fr_window_set_extract_default_dir (window, destination, TRUE);
+ fr_window_set_extract_default_dir (window, destination);
skip_newer = ! gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (GET_WIDGET
("keep_newer_checkbutton"))) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("keep_newer_checkbutton")));
junk_paths = ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("keep_structure_checkbutton")));
@@ -220,14 +220,31 @@ extract_cb (GtkWidget *w,
/* extract ! */
- fr_window_archive_extract (window,
- file_list,
- destination,
- base_dir,
- skip_newer,
- FR_OVERWRITE_ASK,
- junk_paths,
- TRUE);
+ if (fr_window_batch_get_current_action_type (window) == FR_BATCH_ACTION_EXTRACT_INTERACT) {
+
+ /* no need to ask the user the extract options again if the
+ * action is re-executed (for example when asking the password) */
+
+ fr_window_batch_replace_current_action (window,
+ FR_BATCH_ACTION_EXTRACT,
+ extract_data_new (window,
+ file_list,
+ destination,
+ base_dir,
+ skip_newer,
+ FR_OVERWRITE_ASK,
+ junk_paths),
+ (GFreeFunc) extract_data_free);
+ fr_window_batch_resume (window);
+ }
+ else
+ fr_window_archive_extract (window,
+ file_list,
+ destination,
+ base_dir,
+ skip_newer,
+ FR_OVERWRITE_ASK,
+ junk_paths);
_g_string_list_free (file_list);
g_object_unref (destination);
diff --git a/src/fr-window.c b/src/fr-window.c
index 42b93d3..4ba1dab 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -114,7 +114,7 @@ typedef struct {
} FrBatchAction;
-typedef struct {
+struct _ExtractData {
FrWindow *window;
GList *file_list;
GFile *destination;
@@ -123,7 +123,7 @@ typedef struct {
FrOverwrite overwrite;
gboolean junk_paths;
char *password;
-} ExtractData;
+};
typedef enum {
@@ -366,7 +366,6 @@ struct _FrWindowPrivate {
GSettings *settings_nautilus;
gulong theme_changed_handler_id;
- gboolean extract_interact_use_default_dir;
gboolean update_dropped_files;
gboolean batch_adding_one_file;
@@ -384,18 +383,20 @@ struct _FrWindowPrivate {
static void
+fr_batch_action_free (FrBatchAction *action) {
+ if ((action->data != NULL) && (action->free_func != NULL))
+ (*action->free_func) (action->data);
+ g_free (action);
+}
+
+
+static void
fr_window_free_batch_data (FrWindow *window)
{
GList *scan;
- for (scan = window->priv->batch_action_list; scan; scan = scan->next) {
- FrBatchAction *adata = scan->data;
-
- if ((adata->data != NULL) && (adata->free_func != NULL))
- (*adata->free_func) (adata->data);
- g_free (adata);
- }
-
+ for (scan = window->priv->batch_action_list; scan; scan = scan->next)
+ fr_batch_action_free ((FrBatchAction *) scan->data);
g_list_free (window->priv->batch_action_list);
window->priv->batch_action_list = NULL;
window->priv->batch_action = NULL;
@@ -2940,7 +2941,7 @@ _handle_archive_operation_error (FrWindow *window,
}
-static void fr_window_exec_next_batch_action (FrWindow *window);
+static void fr_window_batch_exec_next_action (FrWindow *window);
static void fr_window_archive_list (FrWindow *window);
@@ -3021,7 +3022,7 @@ _archive_operation_completed (FrWindow *window,
fr_window_set_open_default_dir (window, archive_dir);
fr_window_set_add_default_dir (window, archive_dir);
if (! window->priv->freeze_default_dir)
- fr_window_set_extract_default_dir (window, archive_dir, FALSE);
+ fr_window_set_extract_default_dir (window, archive_dir);
}
window->priv->archive_new = FALSE;
@@ -3089,7 +3090,7 @@ _archive_operation_completed (FrWindow *window,
}
if (continue_batch)
- fr_window_exec_next_batch_action (window);
+ fr_window_batch_exec_next_action (window);
else
fr_window_batch_stop (window);
}
@@ -5427,7 +5428,6 @@ fr_window_construct (FrWindow *window)
window->priv->batch_mode = FALSE;
window->priv->batch_action_list = NULL;
window->priv->batch_action = NULL;
- window->priv->extract_interact_use_default_dir = FALSE;
window->priv->password = NULL;
window->priv->compression = g_settings_get_enum (window->priv->settings_general,
PREF_GENERAL_COMPRESSION_LEVEL);
@@ -6279,7 +6279,7 @@ fr_window_archive_remove (FrWindow *window,
/* -- fr_window_archive_extract -- */
-static ExtractData*
+ExtractData *
extract_data_new (FrWindow *window,
GList *file_list,
GFile *destination,
@@ -6304,7 +6304,7 @@ extract_data_new (FrWindow *window,
}
-static void
+void
extract_data_free (ExtractData *edata)
{
g_return_if_fail (edata != NULL);
@@ -7183,7 +7183,7 @@ archive_add_ready_for_conversion_cb (GObject *source_object,
}
fr_window_show_confirmation_dialog_with_open_archive (window);
- fr_window_exec_next_batch_action (window);
+ fr_window_batch_exec_next_action (window);
}
@@ -7517,7 +7517,7 @@ ecryption_copy_ready_cb (GObject *source_object,
fr_window_set_password (window, edata->password);
fr_window_set_encrypt_header (window, edata->encrypt_header);
window->priv->reload_archive = TRUE;
- fr_window_exec_next_batch_action (window);
+ fr_window_batch_exec_next_action (window);
}
@@ -9064,19 +9064,11 @@ fr_window_get_add_default_dir (FrWindow *window)
void
fr_window_set_extract_default_dir (FrWindow *window,
- GFile *default_dir,
- gboolean freeze)
+ GFile *default_dir)
{
g_return_if_fail (window != NULL);
g_return_if_fail (default_dir != NULL);
- /* do not change this dir while it's used by the non-interactive
- * extraction operation. */
- if (window->priv->extract_interact_use_default_dir)
- return;
-
- window->priv->extract_interact_use_default_dir = freeze;
-
_g_object_unref (window->priv->extract_default_dir);
window->priv->extract_default_dir = _get_default_dir (default_dir);
}
@@ -9104,7 +9096,7 @@ fr_window_set_default_dir (FrWindow *window,
fr_window_set_open_default_dir (window, default_dir);
fr_window_set_add_default_dir (window, default_dir);
- fr_window_set_extract_default_dir (window, default_dir, FALSE);
+ fr_window_set_extract_default_dir (window, default_dir);
}
@@ -9132,7 +9124,7 @@ fr_window_use_progress_dialog (FrWindow *window,
/* -- batch mode procedures -- */
-static void fr_window_exec_current_batch_action (FrWindow *window);
+static void fr_window_batch_exec_current_action (FrWindow *window);
static void
@@ -9205,8 +9197,6 @@ fr_window_exec_batch_action (FrWindow *window,
case FR_BATCH_ACTION_EXTRACT_INTERACT:
debug (DEBUG_INFO, "[BATCH] EXTRACT_INTERACT\n");
- if (window->priv->extract_interact_use_default_dir
- NULL,
dlg_extract (NULL, window);
break;
@@ -9269,7 +9259,7 @@ fr_window_exec_batch_action (FrWindow *window,
debug (DEBUG_INFO, "[BATCH] CLOSE\n");
fr_window_archive_close (window);
- fr_window_exec_next_batch_action (window);
+ fr_window_batch_exec_next_action (window);
break;
case FR_BATCH_ACTION_QUIT:
@@ -9349,8 +9339,29 @@ fr_window_batch_append_action (FrWindow *window,
}
+void
+fr_window_batch_replace_current_action (FrWindow *window,
+ FrBatchActionType action,
+ void *data,
+ GFreeFunc free_func)
+{
+ FrBatchAction *a_desc;
+
+ g_return_if_fail (window != NULL);
+ g_return_if_fail (window->priv->batch_action != NULL);
+
+ a_desc = g_new0 (FrBatchAction, 1);
+ a_desc->type = action;
+ a_desc->data = data;
+ a_desc->free_func = free_func;
+
+ fr_batch_action_free ((FrBatchAction *) window->priv->batch_action->data);
+ window->priv->batch_action->data = a_desc;
+}
+
+
static void
-fr_window_exec_current_batch_action (FrWindow *window)
+fr_window_batch_exec_current_action (FrWindow *window)
{
FrBatchAction *action;
@@ -9369,13 +9380,13 @@ fr_window_exec_current_batch_action (FrWindow *window)
static void
-fr_window_exec_next_batch_action (FrWindow *window)
+fr_window_batch_exec_next_action (FrWindow *window)
{
if (window->priv->batch_action != NULL)
window->priv->batch_action = g_list_next (window->priv->batch_action);
else
window->priv->batch_action = window->priv->batch_action_list;
- fr_window_exec_current_batch_action (window);
+ fr_window_batch_exec_current_action (window);
}
@@ -9398,7 +9409,7 @@ fr_window_batch_start (FrWindow *window)
window->priv->batch_action = window->priv->batch_action_list;
gtk_widget_hide (GTK_WIDGET (window));
- fr_window_exec_current_batch_action (window);
+ fr_window_batch_exec_current_action (window);
}
@@ -9411,8 +9422,6 @@ fr_window_batch_stop (FrWindow *window)
return;
}
- window->priv->extract_interact_use_default_dir = FALSE;
-
if (! window->priv->showing_error_dialog) {
g_signal_emit (window,
fr_window_signals[READY],
@@ -9441,7 +9450,7 @@ fr_window_batch_stop_with_error (FrWindow *window,
void
fr_window_batch_resume (FrWindow *window)
{
- fr_window_exec_current_batch_action (window);
+ fr_window_batch_exec_current_action (window);
}
@@ -9452,6 +9461,22 @@ fr_window_is_batch_mode (FrWindow *window)
}
+FrBatchActionType
+fr_window_batch_get_current_action_type (FrWindow *window)
+{
+ FrBatchAction *action;
+
+ if (! window->priv->batch_mode || (window->priv->batch_action == NULL))
+ return FR_BATCH_ACTION_NONE;
+
+ action = (FrBatchAction *) window->priv->batch_action->data;
+ if (action == NULL)
+ return FR_BATCH_ACTION_NONE;
+
+ return action->type;
+}
+
+
void
fr_window_batch_new (FrWindow *window,
const char *title)
diff --git a/src/fr-window.h b/src/fr-window.h
index f9a25f1..1149c28 100644
--- a/src/fr-window.h
+++ b/src/fr-window.h
@@ -28,7 +28,6 @@
#include "fr-archive.h"
#include "fr-error.h"
-
enum {
COLUMN_FILE_DATA,
COLUMN_ICON,
@@ -264,8 +263,7 @@ void fr_window_set_add_default_dir (FrWindow *window,
GFile *default_dir);
GFile * fr_window_get_add_default_dir (FrWindow *window);
void fr_window_set_extract_default_dir (FrWindow *window,
- GFile *default_dir,
- gboolean freeze);
+ GFile *default_dir);
GFile * fr_window_get_extract_default_dir (FrWindow *window);
void fr_window_set_folders_visibility (FrWindow *window,
gboolean value);
@@ -274,6 +272,17 @@ void fr_window_use_progress_dialog (FrWindow *window,
/* batch mode procedures. */
+typedef struct _ExtractData ExtractData;
+
+ExtractData * extract_data_new (FrWindow *window,
+ GList *file_list,
+ GFile *destination,
+ const char *base_dir,
+ gboolean skip_older,
+ FrOverwrite overwrite,
+ gboolean junk_paths);
+void extract_data_free (ExtractData *edata);
+
void fr_window_set_current_action (FrWindow *window,
FrBatchActionType
action,
@@ -290,6 +299,13 @@ void fr_window_batch_append_action (FrWindow *window,
action,
void *data,
GFreeFunc free_func);
+void fr_window_batch_replace_current_action (FrWindow *window,
+ FrBatchActionType
+ action,
+ void *data,
+ GFreeFunc free_func);
+FrBatchActionType
+ fr_window_batch_get_current_action_type(FrWindow *window);
void fr_window_batch_start (FrWindow *window);
void fr_window_batch_stop (FrWindow *window);
void fr_window_batch_stop_with_error (FrWindow *window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
