From 889ca37501afaca5945f41fcd67bd9f0a4b6c19d Mon Sep 17 00:00:00 2001

From: Carlos Soriano <csoriano@gnome.org>

Date: Fri, 3 Mar 2017 19:52:06 +0100

Subject: [PATCH] general: remove gnome-autoar

---

 configure.ac                              |   2 -

 po/POTFILES.in                            |   2 -

 src/Makefile.am                           |   2 -

 src/nautilus-compress-dialog-controller.c | 339 --------------

 src/nautilus-compress-dialog-controller.h |  36 --

 src/nautilus-file-operations.c            | 753 ------------------------------

 src/nautilus-file-operations.h            |  16 -

 src/nautilus-file-undo-operations.c       | 319 -------------

 src/nautilus-file-undo-operations.h       |  58 ---

 src/nautilus-file.c                       |  38 +-

 src/nautilus-files-view.c                 | 616 +-----------------------

 src/nautilus-mime-actions.c               |  23 +-

 12 files changed, 36 insertions(+), 2168 deletions(-)

 delete mode 100644 src/nautilus-compress-dialog-controller.c

 delete mode 100644 src/nautilus-compress-dialog-controller.h

diff --git a/configure.ac b/configure.ac

index 83c7c7d84..acd095bb9 100644

--- a/configure.ac

+++ b/configure.ac

@@ -11,7 +11,6 @@ m4_define(exif_minver,                 0.6.20)

 m4_define(exempi_minver,               2.1.0)

 m4_define(notify_minver,               0.7.0)

 m4_define(schemas_minver,              3.8.0)

-m4_define(autoar_minver,               0.1)

 dnl 1. If the library code has changed at all since last release, then increment revision.

 dnl 2. If any interfaces have been added, then increment current and set revision to 0.

@@ -269,7 +268,6 @@ dnl base libs

 PKG_CHECK_MODULES(BASE, [

 	gtk+-3.0 >= gtk_minver

 	glib-2.0 >= glib_minver

-        gnome-autoar-0 >= autoar_minver

 ])

 dnl common libs (eel, nautilus)

diff --git a/po/POTFILES.in b/po/POTFILES.in

index 8647562f0..6530f6ed4 100644

--- a/po/POTFILES.in

+++ b/po/POTFILES.in

@@ -32,7 +32,6 @@ src/nautilus-canvas-view-container.c

 src/nautilus-clipboard.c

 src/nautilus-column-chooser.c

 src/nautilus-column-utilities.c

-src/nautilus-compress-dialog-controller.c

 src/nautilus-desktop-item-properties.c

 src/nautilus-directory.c

 src/nautilus-dnd.c

@@ -81,7 +80,6 @@ src/nautilus-x-content-bar.c

 src/resources/gtk/help-overlay.ui

 src/resources/gtk/menus.ui

 src/resources/ui/nautilus-batch-rename-dialog.ui

-src/resources/ui/nautilus-compress-dialog.ui

 src/resources/ui/nautilus-create-folder-dialog.ui

 src/resources/ui/nautilus-files-view-context-menus.ui

 src/resources/ui/nautilus-folder-is-empty.ui

diff --git a/src/Makefile.am b/src/Makefile.am

index 562af23f8..2ece291bd 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -257,8 +257,6 @@ nautilus_no_main_sources = \

 	nautilus-rename-file-popover-controller.h \

 	nautilus-new-folder-dialog-controller.c \

 	nautilus-new-folder-dialog-controller.h \

-	nautilus-compress-dialog-controller.c \

-	nautilus-compress-dialog-controller.h \

 	nautilus-operations-ui-manager.c \

 	nautilus-operations-ui-manager.h \

 	nautilus-file-operations.c \

diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c

deleted file mode 100644

index 3937181a8..000000000

--- a/src/nautilus-compress-dialog-controller.c

+++ /dev/null

@@ -1,339 +0,0 @@

-/* nautilus-compress-dialog-controller.h

- *

- * Copyright (C) 2016 the Nautilus developers

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License as

- * published by the Free Software Foundation; either version 2 of the

- * License, or (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with this program; if not, see <http://www.gnu.org/licenses/>.

- *

- */

-

-#include <glib/gi18n.h>

-#include <gnome-autoar/gnome-autoar.h>

-

-#include <eel/eel-vfs-extensions.h>

-

-#include "nautilus-compress-dialog-controller.h"

-

-#include "nautilus-global-preferences.h"

-

-struct _NautilusCompressDialogController

-{

-    NautilusFileNameWidgetController parent_instance;

-

-    GtkWidget *compress_dialog;

-    GtkWidget *description_stack;

-    GtkWidget *name_entry;

-    GtkWidget *zip_radio_button;

-    GtkWidget *tar_xz_radio_button;

-    GtkWidget *seven_zip_radio_button;

-

-    const char *extension;

-

-    gint response_handler_id;

-};

-

-G_DEFINE_TYPE (NautilusCompressDialogController, nautilus_compress_dialog_controller, NAUTILUS_TYPE_FILE_NAME_WIDGET_CONTROLLER);

-

-static gboolean

-nautilus_compress_dialog_controller_name_is_valid (NautilusFileNameWidgetController  *self,

-                                                   gchar                             *name,

-                                                   gchar                            **error_message)

-{

-    if (strlen (name) == 0)

-    {

-        return FALSE;

-    }

-

-    if (strstr (name, "/") != NULL)

-    {

-        *error_message = _("Archive names cannot contain “/”.");

-    }

-    else if (strcmp (name, ".") == 0)

-    {

-        *error_message = _("An archive cannot be called “.”.");

-    }

-    else if (strcmp (name, "..") == 0)

-    {

-        *error_message = _("An archive cannot be called “..”.");

-    }

-

-    return *error_message == NULL;

-}

-

-static gchar *

-nautilus_compress_dialog_controller_get_new_name (NautilusFileNameWidgetController *controller)

-{

-    NautilusCompressDialogController *self;

-    g_autofree gchar *basename = NULL;

-    gchar *error_message = NULL;

-    gboolean valid_name;

-

-    self = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (controller);

-

-    basename = NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_CLASS (nautilus_compress_dialog_controller_parent_class)->get_new_name (controller);

-    /* Do not check or add the extension if the name is invalid */

-    valid_name = nautilus_compress_dialog_controller_name_is_valid (controller,

-                                                                    basename,

-                                                                    &error_message);

-

-    if (!valid_name)

-    {

-        return g_strdup (basename);

-    }

-

-    if (g_str_has_suffix (basename, self->extension))

-    {

-        return g_strdup (basename);

-    }

-

-    return g_strconcat (basename, self->extension, NULL);

-}

-

-static void

-compress_dialog_controller_on_response (GtkDialog *dialog,

-                                        gint       response_id,

-                                        gpointer   user_data)

-{

-    NautilusCompressDialogController *controller;

-

-    controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);

-

-    if (response_id != GTK_RESPONSE_OK)

-    {

-        g_signal_emit_by_name (controller, "cancelled");

-    }

-}

-

-static void

-update_selected_format (NautilusCompressDialogController *self,

-                        NautilusCompressionFormat         format)

-{

-    const char *extension;

-    const char *description_label_name;

-    GtkWidget *active_button;

-

-    switch (format)

-    {

-        case NAUTILUS_COMPRESSION_ZIP:

-        {

-            extension = ".zip";

-            description_label_name = "zip-description-label";

-            active_button = self->zip_radio_button;

-        }

-        break;

-

-        case NAUTILUS_COMPRESSION_TAR_XZ:

-        {

-            extension = ".tar.xz";

-            description_label_name = "tar-xz-description-label";

-            active_button = self->tar_xz_radio_button;

-        }

-        break;

-

-        case NAUTILUS_COMPRESSION_7ZIP:

-        {

-            extension = ".7z";

-            description_label_name = "seven-zip-description-label";

-            active_button = self->seven_zip_radio_button;

-        }

-        break;

-

-        default:

-        {

-            g_assert_not_reached ();

-        }

-        break;

-    }

-

-    self->extension = extension;

-

-    gtk_stack_set_visible_child_name (GTK_STACK (self->description_stack),

-                                      description_label_name);

-

-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (active_button),

-                                  TRUE);

-

-    g_settings_set_enum (nautilus_compression_preferences,

-                         NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT,

-                         format);

-    /* Since the extension changes when the button is toggled, force a

-     * verification of the new file name by simulating an entry change

-     */

-    g_signal_emit_by_name (self->name_entry, "changed");

-}

-

-static void

-zip_radio_button_on_toggled (GtkToggleButton *toggle_button,

-                             gpointer         user_data)

-{

-    NautilusCompressDialogController *controller;

-

-    controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);

-

-    if (!gtk_toggle_button_get_active (toggle_button))

-    {

-        return;

-    }

-

-    update_selected_format (controller,

-                            NAUTILUS_COMPRESSION_ZIP);

-}

-

-static void

-tar_xz_radio_button_on_toggled (GtkToggleButton *toggle_button,

-                                gpointer         user_data)

-{

-    NautilusCompressDialogController *controller;

-

-    controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);

-

-    if (!gtk_toggle_button_get_active (toggle_button))

-    {

-        return;

-    }

-

-    update_selected_format (controller,

-                            NAUTILUS_COMPRESSION_TAR_XZ);

-}

-

-static void

-seven_zip_radio_button_on_toggled (GtkToggleButton *toggle_button,

-                                   gpointer         user_data)

-{

-    NautilusCompressDialogController *controller;

-

-    controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);

-

-    if (!gtk_toggle_button_get_active (toggle_button))

-    {

-        return;

-    }

-

-    update_selected_format (controller,

-                            NAUTILUS_COMPRESSION_7ZIP);

-}

-

-NautilusCompressDialogController *

-nautilus_compress_dialog_controller_new (GtkWindow         *parent_window,

-                                         NautilusDirectory *destination_directory,

-                                         gchar             *initial_name)

-{

-    NautilusCompressDialogController *self;

-    g_autoptr (GtkBuilder) builder = NULL;

-    GtkWidget *compress_dialog;

-    GtkWidget *error_revealer;

-    GtkWidget *error_label;

-    GtkWidget *name_entry;

-    GtkWidget *activate_button;

-    GtkWidget *description_stack;

-    GtkWidget *zip_radio_button;

-    GtkWidget *tar_xz_radio_button;

-    GtkWidget *seven_zip_radio_button;

-    NautilusCompressionFormat format;

-

-    builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-compress-dialog.ui");

-    compress_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "compress_dialog"));

-    error_revealer = GTK_WIDGET (gtk_builder_get_object (builder, "error_revealer"));

-    error_label = GTK_WIDGET (gtk_builder_get_object (builder, "error_label"));

-    name_entry = GTK_WIDGET (gtk_builder_get_object (builder, "name_entry"));

-    activate_button = GTK_WIDGET (gtk_builder_get_object (builder, "activate_button"));

-    zip_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "zip_radio_button"));

-    tar_xz_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "tar_xz_radio_button"));

-    seven_zip_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "seven_zip_radio_button"));

-    description_stack = GTK_WIDGET (gtk_builder_get_object (builder, "description_stack"));

-

-    gtk_window_set_transient_for (GTK_WINDOW (compress_dialog),

-                                  parent_window);

-

-    self = g_object_new (NAUTILUS_TYPE_COMPRESS_DIALOG_CONTROLLER,

-                         "error-revealer", error_revealer,

-                         "error-label", error_label,

-                         "name-entry", name_entry,

-                         "activate-button", activate_button,

-                         "containing-directory", destination_directory, NULL);

-

-    self->compress_dialog = compress_dialog;

-    self->zip_radio_button = zip_radio_button;

-    self->tar_xz_radio_button = tar_xz_radio_button;

-    self->seven_zip_radio_button = seven_zip_radio_button;

-    self->description_stack = description_stack;

-    self->name_entry = name_entry;

-

-    self->response_handler_id = g_signal_connect (compress_dialog,

-                                                  "response",

-                                                  (GCallback) compress_dialog_controller_on_response,

-                                                  self);

-

-    gtk_builder_add_callback_symbols (builder,

-                                      "zip_radio_button_on_toggled",

-                                      G_CALLBACK (zip_radio_button_on_toggled),

-                                      "tar_xz_radio_button_on_toggled",

-                                      G_CALLBACK (tar_xz_radio_button_on_toggled),

-                                      "seven_zip_radio_button_on_toggled",

-                                      G_CALLBACK (seven_zip_radio_button_on_toggled),

-                                      NULL);

-    gtk_builder_connect_signals (builder, self);

-

-    format = g_settings_get_enum (nautilus_compression_preferences,

-                                  NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT);

-

-    update_selected_format (self, format);

-

-    if (initial_name != NULL)

-    {

-        gtk_entry_set_text (GTK_ENTRY (name_entry), initial_name);

-    }

-

-    gtk_widget_show_all (compress_dialog);

-

-    return self;

-}

-

-static void

-nautilus_compress_dialog_controller_init (NautilusCompressDialogController *self)

-{

-}

-

-static void

-nautilus_compress_dialog_controller_finalize (GObject *object)

-{

-    NautilusCompressDialogController *self;

-

-    self = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (object);

-

-    if (self->compress_dialog != NULL)

-    {

-        if (self->response_handler_id > 0)

-        {

-            g_signal_handler_disconnect (self->compress_dialog,

-                                         self->response_handler_id);

-            self->response_handler_id = 0;

-        }

-        gtk_widget_destroy (self->compress_dialog);

-        self->compress_dialog = NULL;

-    }

-

-    G_OBJECT_CLASS (nautilus_compress_dialog_controller_parent_class)->finalize (object);

-}

-

-static void

-nautilus_compress_dialog_controller_class_init (NautilusCompressDialogControllerClass *klass)

-{

-    GObjectClass *object_class = G_OBJECT_CLASS (klass);

-    NautilusFileNameWidgetControllerClass *parent_class = NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_CLASS (klass);

-

-    object_class->finalize = nautilus_compress_dialog_controller_finalize;

-

-    parent_class->get_new_name = nautilus_compress_dialog_controller_get_new_name;

-    parent_class->name_is_valid = nautilus_compress_dialog_controller_name_is_valid;

-}

diff --git a/src/nautilus-compress-dialog-controller.h b/src/nautilus-compress-dialog-controller.h

deleted file mode 100644

index bb89413f1..000000000

--- a/src/nautilus-compress-dialog-controller.h

+++ /dev/null

@@ -1,36 +0,0 @@

-/* nautilus-compress-dialog-controller.h

- *

- * Copyright (C) 2016 the Nautilus developers

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License as

- * published by the Free Software Foundation; either version 2 of the

- * License, or (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with this program; if not, see <http://www.gnu.org/licenses/>.

- *

- */

-

-#ifndef NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H

-#define NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H

-

-#include <glib.h>

-#include <gtk/gtk.h>

-

-#include "nautilus-file-name-widget-controller.h"

-#include "nautilus-directory.h"

-

-#define NAUTILUS_TYPE_COMPRESS_DIALOG_CONTROLLER nautilus_compress_dialog_controller_get_type ()

-G_DECLARE_FINAL_TYPE (NautilusCompressDialogController, nautilus_compress_dialog_controller, NAUTILUS, COMPRESS_DIALOG_CONTROLLER, NautilusFileNameWidgetController)

-

-NautilusCompressDialogController * nautilus_compress_dialog_controller_new (GtkWindow         *parent_window,

-                                                                            NautilusDirectory *destination_directory,

-                                                                            gchar             *initial_name);

-

-#endif /* NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H */

diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c

index fd35faf3f..728a80df8 100644

--- a/src/nautilus-file-operations.c

+++ b/src/nautilus-file-operations.c

@@ -160,7 +160,6 @@ typedef enum

     OP_KIND_MOVE,

     OP_KIND_DELETE,

     OP_KIND_TRASH,

-    OP_KIND_COMPRESS

 } OpKind;

 typedef struct

@@ -180,40 +179,6 @@ typedef struct

     int last_reported_files_left;

 } TransferInfo;

-typedef struct

-{

-    CommonJob common;

-    GList *source_files;

-    GFile *destination_directory;

-    GList *output_files;

-

-    gdouble base_progress;

-

-    guint64 archive_compressed_size;

-    guint64 total_compressed_size;

-

-    NautilusExtractCallback done_callback;

-    gpointer done_callback_data;

-} ExtractJob;

-

-typedef struct

-{

-    CommonJob common;

-    GList *source_files;

-    GFile *output_file;

-

-    AutoarFormat format;

-    AutoarFilter filter;

-

-    guint64 total_size;

-    guint total_files;

-

-    gboolean success;

-

-    NautilusCreateCallback done_callback;

-    gpointer done_callback_data;

-} CompressJob;

-

 #define SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE 8

 #define NSEC_PER_MICROSEC 1000

 #define PROGRESS_NOTIFY_INTERVAL 100 * NSEC_PER_MICROSEC

@@ -3083,12 +3048,6 @@ report_preparing_count_progress (CommonJob  *job,

                        source_info->num_files);

             }

             break;

-

-        case OP_KIND_COMPRESS:

-            s = f (ngettext ("Preparing to compress %'d file",

-                             "Preparing to compress %'d files",

-                             source_info->num_files),

-                   source_info->num_files);

     }

     nautilus_progress_info_take_details (job->progress, s);

@@ -3135,9 +3094,6 @@ get_scan_primary (OpKind kind)

             {

                 return f (_("Error while moving files to trash."));

             }

-

-        case OP_KIND_COMPRESS:

-            return f (_("Error while compressing files."));

     }

 }

@@ -8141,715 +8097,6 @@ nautilus_file_mark_desktop_file_trusted (GFile              *file,

     g_object_unref (task);

 }

-static void

-extract_task_done (GObject      *source_object,

-                   GAsyncResult *res,

-                   gpointer      user_data)

-{

-    ExtractJob *extract_job;

-

-    extract_job = user_data;

-

-    if (extract_job->done_callback)

-    {

-        extract_job->done_callback (extract_job->output_files,

-                                    extract_job->done_callback_data);

-    }

-

-    g_list_free_full (extract_job->source_files, g_object_unref);

-    g_list_free_full (extract_job->output_files, g_object_unref);

-    g_object_unref (extract_job->destination_directory);

-

-    finalize_common ((CommonJob *) extract_job);

-

-    nautilus_file_changes_consume_changes (TRUE);

-}

-

-static GFile *

-extract_job_on_decide_destination (AutoarExtractor *extractor,

-                                   GFile           *destination,

-                                   GList           *files,

-                                   gpointer         user_data)

-{

-    ExtractJob *extract_job = user_data;

-    GFile *decided_destination;

-    g_autofree char *basename = NULL;

-

-    nautilus_progress_info_set_details (extract_job->common.progress,

-                                        _("Verifying destination"));

-

-    basename = g_file_get_basename (destination);

-    decided_destination = nautilus_generate_unique_file_in_directory (extract_job->destination_directory,

-                                                                      basename);

-

-    if (job_aborted ((CommonJob *) extract_job))

-    {

-        g_object_unref (decided_destination);

-        return NULL;

-    }

-

-    extract_job->output_files = g_list_prepend (extract_job->output_files,

-                                                decided_destination);

-

-    return g_object_ref (decided_destination);

-}

-

-static void

-extract_job_on_progress (AutoarExtractor *extractor,

-                         guint64          archive_current_decompressed_size,

-                         guint            archive_current_decompressed_files,

-                         gpointer         user_data)

-{

-    ExtractJob *extract_job = user_data;

-    CommonJob *common = user_data;

-    GFile *source_file;

-    char *details;

-    double elapsed;

-    double transfer_rate;

-    int remaining_time;

-    guint64 archive_total_decompressed_size;

-    gdouble archive_weight;

-    gdouble archive_decompress_progress;

-    guint64 job_completed_size;

-    gdouble job_progress;

-

-    source_file = autoar_extractor_get_source_file (extractor);

-

-    nautilus_progress_info_take_status (common->progress,

-                                        f (_("Extracting “%B”"), source_file));

-

-    archive_total_decompressed_size = autoar_extractor_get_total_size (extractor);

-

-    archive_decompress_progress = (gdouble) archive_current_decompressed_size /

-                                  (gdouble) archive_total_decompressed_size;

-

-    archive_weight = 0;

-    if (extract_job->total_compressed_size)

-    {

-        archive_weight = (gdouble) extract_job->archive_compressed_size /

-                         (gdouble) extract_job->total_compressed_size;

-    }

-

-    job_progress = archive_decompress_progress * archive_weight + extract_job->base_progress;

-

-    elapsed = g_timer_elapsed (common->time, NULL);

-

-    transfer_rate = 0;

-    remaining_time = -1;

-

-    job_completed_size = job_progress * extract_job->total_compressed_size;

-

-    if (elapsed > 0)

-    {

-        transfer_rate = job_completed_size / elapsed;

-    }

-    if (transfer_rate > 0)

-    {

-        remaining_time = (extract_job->total_compressed_size - job_completed_size) /

-                         transfer_rate;

-    }

-

-    if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE ||

-        transfer_rate == 0)

-    {

-        /* To translators: %S will expand to a size like "2 bytes" or

-         * "3 MB", so something like "4 kb / 4 MB"

-         */

-        details = f (_("%S / %S"), job_completed_size, extract_job->total_compressed_size);

-    }

-    else

-    {

-        /* To translators: %S will expand to a size like "2 bytes" or

-         * "3 MB", %T to a time duration like "2 minutes". So the whole

-         * thing will be something like

-         * "2 kb / 4 MB -- 2 hours left (4kb/sec)"

-         *

-         * The singular/plural form will be used depending on the

-         * remaining time (i.e. the %T argument).

-         */

-        details = f (ngettext ("%S / %S \xE2\x80\x94 %T left (%S/sec)",

-                               "%S / %S \xE2\x80\x94 %T left (%S/sec)",

-                               seconds_count_format_time_units (remaining_time)),

-                     job_completed_size, extract_job->total_compressed_size,

-                     remaining_time,

-                     (goffset) transfer_rate);

-    }

-

-    nautilus_progress_info_take_details (common->progress, details);

-

-    if (elapsed > SECONDS_NEEDED_FOR_APROXIMATE_TRANSFER_RATE)

-    {

-        nautilus_progress_info_set_remaining_time (common->progress,

-                                                   remaining_time);

-        nautilus_progress_info_set_elapsed_time (common->progress,

-                                                 elapsed);

-    }

-

-    nautilus_progress_info_set_progress (common->progress, job_progress, 1);

-}

-

-static void

-extract_job_on_error (AutoarExtractor *extractor,

-                      GError          *error,

-                      gpointer         user_data)

-{

-    ExtractJob *extract_job = user_data;

-    GFile *source_file;

-    gint response_id;

-

-    source_file = autoar_extractor_get_source_file (extractor);

-

-    if (IS_IO_ERROR (error, NOT_SUPPORTED))

-    {

-        handle_unsupported_compressed_file (extract_job->common.parent_window,

-                                            source_file);

-

-        return;

-    }

-

-    nautilus_progress_info_take_status (extract_job->common.progress,

-                                        f (_("Error extracting “%B”"),

-                                           source_file));

-

-    response_id = run_warning ((CommonJob *) extract_job,

-                               f (_("There was an error while extracting “%B”."),

-                                  source_file),

-                               g_strdup (error->message),

-                               NULL,

-                               FALSE,

-                               CANCEL,