file-roller r2330 - in trunk: . src

[paobac svn gnome org]

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

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

	* src/fr-window.c (action_started): 
	
	Show the progress dialog without any delay for any operation when
	in batch mode. 

	* src/gio-utils.c: 
	* src/fr-window.c: 
	* src/fr-archive.c: 
	* src/file-utils.c: 
	* src/dlg-extract.c: 
	* src/dlg-batch-add.c: 
	
	GErrors must be initialized to NULL.

Modified:
   trunk/ChangeLog
   trunk/src/dlg-batch-add.c
   trunk/src/dlg-extract.c
   trunk/src/file-utils.c
   trunk/src/fr-archive.c
   trunk/src/fr-window.c
   trunk/src/gio-utils.c

Modified: trunk/src/dlg-batch-add.c
==============================================================================
--- trunk/src/dlg-batch-add.c	(original)
+++ trunk/src/dlg-batch-add.c	Thu Jun 19 16:56:36 2008
@@ -106,7 +106,7 @@
 	char       *tmp;
 	const char *archive_ext;
 	gboolean    do_not_add = FALSE;
-	GError     *error;
+	GError     *error = NULL;
 
 	data->add_clicked = TRUE;
 

Modified: trunk/src/dlg-extract.c
==============================================================================
--- trunk/src/dlg-extract.c	(original)
+++ trunk/src/dlg-extract.c	Thu Jun 19 16:56:36 2008
@@ -87,7 +87,7 @@
 	GList      *file_list;
 	char       *password;
 	char       *base_dir = NULL;
-	GError     *error;
+	GError     *error = NULL;
 
 	data->extract_clicked = TRUE;
 

Modified: trunk/src/file-utils.c
==============================================================================
--- trunk/src/file-utils.c	(original)
+++ trunk/src/file-utils.c	Thu Jun 19 16:56:36 2008
@@ -829,7 +829,7 @@
 {
 	GFile     *dir;
 	gboolean   result;
-	GError    *error;
+	GError    *error = NULL;
 	
 	dir = g_file_new_for_uri (uri);
 	result = delete_directory_recursive (dir, &error);

Modified: trunk/src/fr-archive.c
==============================================================================
--- trunk/src/fr-archive.c	(original)
+++ trunk/src/fr-archive.c	Thu Jun 19 16:56:36 2008
@@ -659,7 +659,7 @@
 	char   *parent_parent;
 	char   *new_content_uri;
 	GFile  *source, *destination, *parent_file;
-	GError *error;
+	GError *error = NULL;
 
 	content_uri = get_dir_content_if_unique (archive->priv->extraction_destination);
 	if (content_uri == NULL)
@@ -1551,7 +1551,7 @@
 		local_uri = g_strconcat ("file://", tmp_dir, "/", partial_filename, NULL);
 		local_folder_uri = remove_level_from_path (local_uri);
 		if (g_hash_table_lookup (created_folders, local_folder_uri) == NULL) {
-			GError *error;
+			GError *error = NULL;
 			if (! ensure_dir_exists (local_uri, 0755, &error)) {
 				g_free (local_folder_uri);
 				g_free (local_uri);

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Thu Jun 19 16:56:36 2008
@@ -2691,7 +2691,7 @@
 		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);
+		open_progress_dialog (window, window->priv->batch_mode);
 		break;
 	}
 		
@@ -6362,7 +6362,7 @@
 {
 	ExtractData *edata;
 	gboolean     do_not_extract = FALSE;
-	GError      *error;
+	GError      *error = NULL;
 
 	edata = extract_data_new (file_list,
 				  extract_to_dir,
@@ -7840,7 +7840,7 @@
         const char *first_mime_type;
         GAppInfo   *app;
         GList      *files_to_open = NULL;
-        GError     *error;
+        GError     *error = NULL;
 
 	g_return_val_if_fail (file_list != NULL, FALSE);
 

Modified: trunk/src/gio-utils.c
==============================================================================
--- trunk/src/gio-utils.c	(original)
+++ trunk/src/gio-utils.c	Thu Jun 19 16:56:36 2008
@@ -252,7 +252,7 @@
 		      		 gpointer      user_data)
 {
 	ForEachChildData *fec = user_data;
-	GError           *error;
+	GError           *error = NULL;
 	
 	if (! g_file_enumerator_close_finish (fec->enumerator,
 					      result,
@@ -911,7 +911,7 @@
 {
 	CopyFilesData *cfd = user_data;
 	GFile         *source = cfd->source->data;
-	GError        *error;
+	GError        *error = NULL;
 	
 	if (! g_file_copy_finish (source, result, &error)) {
 		if (cfd->callback)