[Xfce4-commits] r22636 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2006-08-03 11:14:44 +0000 (Thu, 03 Aug 2006)
New Revision: 22636

Modified:
   xarchiver/trunk/src/callbacks.c
   xarchiver/trunk/src/extract_dialog.c
Log:
Workaround for viewing ASCII inside directories for tar archive.
Fixed impossibility to quit Xarchiver after dropping and then clicking Cancel on the new dialog. Baze: thank you ;)


Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c	2006-08-03 09:17:51 UTC (rev 22635)
+++ xarchiver/trunk/src/callbacks.c	2006-08-03 11:14:44 UTC (rev 22636)
@@ -1180,7 +1180,6 @@
 
 		archive->parse_output = 0;
 		command = xa_extract_single_files ( archive , names, "/tmp");
-	
 		SpawnAsyncProcess ( archive , command , 0, 0);
 		g_free ( command );
 		g_string_free (names,TRUE);
@@ -1247,7 +1246,7 @@
 	}
 	else
 	{
-		response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,"An error occurred while extracting the file to be viewed!",error->message);
+		response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,"An error occurred while extracting the file to be viewed:",error->message);
 		g_error_free (error);
 		return NULL;
 	}
@@ -1868,7 +1867,11 @@
     }
 
 	if ( archive->nr_of_files == 0 && archive->nr_of_dirs == 0)
+	{
 		xa_new_archive ( NULL , NULL );
+		if (archive->path == NULL)
+			return;
+	}
 	if ( (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) && ! one_file)
 	{
 		response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Bzip2 or gzip cannot compress more than one file!"),_("Please choose another archive format!") );

Modified: xarchiver/trunk/src/extract_dialog.c
===================================================================
--- xarchiver/trunk/src/extract_dialog.c	2006-08-03 09:17:51 UTC (rev 22635)
+++ xarchiver/trunk/src/extract_dialog.c	2006-08-03 11:14:44 UTC (rev 22636)
@@ -552,8 +552,7 @@
 
 	if ( archive->full_path == 0)
 	{
-		if (archive->tar_strip_value == 0)
-			archive->tar_strip_value = CountCharacter ( files->str , '/');
+		archive->tar_strip_value = CountCharacter ( files->str , '/');
 		gchar *digit;
 		digit = g_strdup_printf ( "%d" , archive->tar_strip_value );
 		strip_string = g_strconcat ( "--strip-components=" , digit , " " , NULL );