[file-roller: 20/123] fr-window.h: removed internal functions from the header

[Paolo Bacchilega <paobac src gnome org>]

commit 98de733ad5cc57a2aa524394ecdbbd69717a56e0
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Jul 20 22:40:19 2012 +0200

    fr-window.h: removed internal functions from the header

 src/dlg-ask-password.c      |    1 +
 src/dlg-batch-add.c         |    4 +---
 src/dlg-extract.c           |    5 ++---
 src/dlg-package-installer.c |   10 ++++------
 src/fr-window.c             |   16 ++++++++++++++++
 src/fr-window.h             |   12 +++++-------
 6 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/src/dlg-ask-password.c b/src/dlg-ask-password.c
index 8eb9899..c754876 100644
--- a/src/dlg-ask-password.c
+++ b/src/dlg-ask-password.c
@@ -69,6 +69,7 @@ ask_password__response_cb (GtkWidget  *dialog,
 		else if (data->pwd_type == FR_PASSWORD_TYPE_PASTE_FROM)
 			fr_window_set_password_for_paste (data->window, password);
 		g_free (password);
+
 		if (fr_window_is_batch_mode (data->window))
 			fr_window_resume_batch (data->window);
 		else
diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c
index 1b787c0..87650e5 100644
--- a/src/dlg-batch-add.c
+++ b/src/dlg-batch-add.c
@@ -75,10 +75,8 @@ destroy_cb (GtkWidget  *widget,
 	/*g_settings_set_boolean (data->settings, PREF_BATCH_ADD_OTHER_OPTIONS, data->add_clicked ? FALSE : gtk_expander_get_expanded (GTK_EXPANDER (GET_WIDGET ("a_other_options_expander"))));*/
 	g_settings_set_boolean (data->settings_general, PREF_GENERAL_ENCRYPT_HEADER, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("a_encrypt_header_checkbutton"))));
 
-	if (! data->add_clicked) {
-		fr_window_pop_message (data->window);
+	if (! data->add_clicked)
 		fr_window_stop_batch (data->window);
-	}
 
 	g_object_unref (data->builder);
 	g_object_unref (data->settings_general);
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index a13d385..417665f 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -58,10 +58,9 @@ static void
 destroy_cb (GtkWidget  *widget,
 	    DialogData *data)
 {
-	if (! data->extract_clicked) {
-		fr_window_pop_message (data->window);
+	if (! data->extract_clicked)
 		fr_window_stop_batch (data->window);
-	}
+
 	_g_string_list_free (data->selected_files);
 	g_free (data->base_dir_for_selection);
 	g_object_unref (data->settings);
diff --git a/src/dlg-package-installer.c b/src/dlg-package-installer.c
index b109544..4f4e281 100644
--- a/src/dlg-package-installer.c
+++ b/src/dlg-package-installer.c
@@ -58,12 +58,10 @@ package_installer_terminated (InstallerData *idata,
 		gdk_window_set_cursor (window, NULL);
 
 	if (error_type != FR_ERROR_NONE) {
-		/* FIXME: libarchive
-		fr_archive_action_completed (idata->archive,
-					     idata->action,
-					     error_type,
-					     error_message);
-		*/
+		fr_window_stop_batch_with_error (idata->window,
+						 idata->action,
+						 error_type,
+						 error_message);
 	}
 	else {
 		update_registered_archives_capabilities ();
diff --git a/src/fr-window.c b/src/fr-window.c
index 826f6e2..b168b86 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -9145,6 +9145,7 @@ fr_window_start_batch (FrWindow *window)
 void
 fr_window_stop_batch (FrWindow *window)
 {
+	fr_window_pop_message (window);
 	fr_window_update_sensitivity (window);
 	fr_window_update_statusbar_list_info (window);
 
@@ -9164,6 +9165,21 @@ fr_window_stop_batch (FrWindow *window)
 
 
 void
+fr_window_stop_batch_with_error (FrWindow     *window,
+				 FrAction      action,
+				 FrErrorType   error_type,
+				 const char   *error_message)
+{
+	GError *error;
+
+	error = g_error_new_literal (FR_ERROR, error_type, error_message);
+	_archive_operation_completed (window, action , error);
+
+	g_error_free (error);
+}
+
+
+void
 fr_window_resume_batch (FrWindow *window)
 {
 	fr_window_exec_current_batch_action (window);
diff --git a/src/fr-window.h b/src/fr-window.h
index 0fe78e4..7e1bcf1 100644
--- a/src/fr-window.h
+++ b/src/fr-window.h
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include "typedefs.h"
 #include "fr-archive.h"
+#include "fr-error.h"
 
 
 enum {
@@ -191,7 +192,6 @@ void            fr_window_set_list_mode                (FrWindow      *window,
 
 /**/
 
-void            fr_window_update_list_order            (FrWindow    *window);
 GList *         fr_window_get_file_list_selection      (FrWindow    *window,
 						        gboolean     recursive,
 						        gboolean    *has_dirs);
@@ -228,8 +228,6 @@ void            fr_window_paste_selection              (FrWindow    *window,
 /**/
 
 void            fr_window_stop                         (FrWindow    *window);
-void            fr_window_start_activity_mode          (FrWindow    *window);
-void            fr_window_stop_activity_mode           (FrWindow    *window);
 
 /**/
 
@@ -248,7 +246,6 @@ void            fr_window_open_files_with_application  (FrWindow   *window,
 						        GAppInfo   *app);
 gboolean        fr_window_update_files                 (FrWindow   *window,
 						        GList      *file_list);
-void            fr_window_update_columns_visibility    (FrWindow   *window);
 void            fr_window_update_history_list          (FrWindow   *window);
 void            fr_window_set_default_dir              (FrWindow   *window,
 						        const char *default_dir,
@@ -263,9 +260,6 @@ void            fr_window_set_extract_default_dir      (FrWindow   *window,
 						        const char *default_dir,
 						        gboolean    freeze);
 const char *    fr_window_get_extract_default_dir      (FrWindow   *window);
-void            fr_window_push_message                 (FrWindow   *window,
-						        const char *msg);
-void            fr_window_pop_message                  (FrWindow   *window);
 void            fr_window_set_toolbar_visibility       (FrWindow   *window,
 						        gboolean    value);
 void            fr_window_set_statusbar_visibility     (FrWindow   *window,
@@ -294,6 +288,10 @@ void            fr_window_append_batch_action          (FrWindow      *window,
 						        GFreeFunc      free_func);
 void            fr_window_start_batch                  (FrWindow      *window);
 void            fr_window_stop_batch                   (FrWindow      *window);
+void            fr_window_stop_batch_with_error        (FrWindow     *window,
+							FrAction      action,
+							FrErrorType   error_type,
+							const char   *error_message);
 void            fr_window_resume_batch                 (FrWindow      *window);
 gboolean        fr_window_is_batch_mode                (FrWindow      *window);
 void            fr_window_set_batch__extract           (FrWindow      *window,