file-roller r2328 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Thu Jun 19 16:33:29 2008
New Revision: 2328
URL: http://svn.gnome.org/viewvc/file-roller?rev=2328&view=rev

Log:
2008-06-19  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-window.h: 
	* src/dlg-extract.c:
	* src/fr-window.c: 
	
	Show the extract progress dialog without any delay when extracting
	in batch mode.  
	Do not ask whether to open the destination folder if the extraction 
	was done with drag&drop or with an extract_here	operation because in 
	these cases the user already views the destination.

Modified:
   trunk/ChangeLog
   trunk/src/dlg-extract.c
   trunk/src/fr-window.c
   trunk/src/fr-window.h

Modified: trunk/src/dlg-extract.c
==============================================================================
--- trunk/src/dlg-extract.c	(original)
+++ trunk/src/dlg-extract.c	Thu Jun 19 16:33:29 2008
@@ -258,7 +258,8 @@
 				   skip_newer,
 				   overwrite,
 				   junk_paths,
-				   password);
+				   password,
+				   TRUE);
 
 	path_list_free (file_list);
 	g_free (extract_to_dir);

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Thu Jun 19 16:33:29 2008
@@ -375,7 +375,7 @@
 	/* batch mode data */
 
 	gboolean          batch_mode;          /* whether we are in a non interactive
-					 * mode. */
+					 	* mode. */
 	GList            *batch_action_list;   /* FRBatchAction * elements */
 	GList            *batch_action;        /* current action. */
 
@@ -2688,7 +2688,7 @@
 	
 	switch (action) {
 	case FR_ACTION_EXTRACTING_FILES:
-		open_progress_dialog (window, window->priv->ask_to_open_destination_after_extraction || window->priv->convert_data.converting);
+		open_progress_dialog (window, window->priv->ask_to_open_destination_after_extraction || window->priv->convert_data.converting || window->priv->batch_mode);
 		break;
 	default:
 		open_progress_dialog (window, FALSE);
@@ -4017,7 +4017,8 @@
 					   FALSE,
 					   TRUE,
 					   FALSE,
-					   window->priv->password);
+					   window->priv->password,
+					   FALSE);
 		path_list_free (window->priv->drag_file_list);
 		window->priv->drag_file_list = NULL;
 	}
@@ -6334,7 +6335,7 @@
 					    edata,
 					    (GFreeFunc) extract_data_free);
 
-	window->priv->ask_to_open_destination_after_extraction = TRUE;
+	window->priv->ask_to_open_destination_after_extraction = FALSE;
 			
 	fr_process_clear (window->archive->process);
 	if (fr_archive_extract_here (window->archive,
@@ -6356,7 +6357,8 @@
 			   gboolean    skip_older,
 			   gboolean    overwrite,
 			   gboolean    junk_paths,
-			   const char *password)
+			   const char *password,
+			   gboolean    ask_to_open_destination)
 {
 	ExtractData *edata;
 	gboolean     do_not_extract = FALSE;
@@ -6440,7 +6442,7 @@
 		return;
 	}
 
-	window->priv->ask_to_open_destination_after_extraction = TRUE;
+	window->priv->ask_to_open_destination_after_extraction = ask_to_open_destination;
 
 	fr_process_clear (window->archive->process);
 	fr_archive_extract (window->archive,
@@ -8174,7 +8176,8 @@
 					   edata->skip_older,
 					   edata->overwrite,
 					   edata->junk_paths,
-					   window->priv->password);
+					   window->priv->password,
+					   TRUE);
 		break;
 
 	case FR_BATCH_ACTION_EXTRACT_HERE:
@@ -8192,7 +8195,8 @@
 		debug (DEBUG_INFO, "[BATCH] EXTRACT_INTERACT\n");
 
 		if (window->priv->extract_interact_use_default_dir
-		    && (window->priv->extract_default_dir != NULL))
+		    && (window->priv->extract_default_dir != NULL)) 
+		{
 			fr_window_archive_extract (window,
 						   NULL,
 						   window->priv->extract_default_dir,
@@ -8200,7 +8204,9 @@
 						   FALSE,
 						   TRUE,
 						   FALSE,
-						   window->priv->password);
+						   window->priv->password,
+						   TRUE);
+		}
 		else {
 			fr_window_push_message (window, _("Extract archive"));
 			dlg_extract (NULL, window);

Modified: trunk/src/fr-window.h
==============================================================================
--- trunk/src/fr-window.h	(original)
+++ trunk/src/fr-window.h	Thu Jun 19 16:33:29 2008
@@ -157,7 +157,8 @@
 						 gboolean       skip_older,
 						 gboolean       overwrite,
 						 gboolean       junk_paths,
-						 const char    *password);
+						 const char    *password,
+						 gboolean       ask_to_open_destination);
 void        fr_window_archive_extract_here      (FrWindow      *window,
 						 gboolean       skip_older,
 						 gboolean       overwrite,