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

[Giuseppe Torelli]

Author: colossus
Date: 2006-08-03 09:04:59 +0000 (Thu, 03 Aug 2006)
New Revision: 22634

Modified:
   xarchiver/trunk/src/add_dialog.c
   xarchiver/trunk/src/bzip2.c
Log:
Fixed Stop button disabled during bzip2/gzip operations.
Fixed wrong message during adding operation performed with DnD.


Modified: xarchiver/trunk/src/add_dialog.c
===================================================================
--- xarchiver/trunk/src/add_dialog.c	2006-08-03 08:43:46 UTC (rev 22633)
+++ xarchiver/trunk/src/add_dialog.c	2006-08-03 09:04:59 UTC (rev 22634)
@@ -553,8 +553,6 @@
 			xa_set_button_state (0,0,0,0,0);
 			archive->status = XA_ARCHIVESTATUS_ADD;
 
-			if (archive->type != XARCHIVETYPE_BZIP2 && archive->type != XARCHIVETYPE_GZIP)
-				Update_StatusBar ( _("Adding files to the archive, please wait..."));
 			command = xa_add_single_files ( archive, names, compression_string);
 			g_string_free ( names, TRUE);
 			if (compression_string != NULL)
@@ -572,7 +570,10 @@
 	tar = g_find_program_in_path ("gtar");
 	if (tar == NULL)
 		tar = g_strdup ("tar");
-
+	
+	if (archive->type != XARCHIVETYPE_BZIP2 && archive->type != XARCHIVETYPE_GZIP)
+		Update_StatusBar ( _("Adding files to the archive, please wait..."));
+	
 	switch (archive->type)
 	{
 		case XARCHIVETYPE_BZIP2:

Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c	2006-08-03 08:43:46 UTC (rev 22633)
+++ xarchiver/trunk/src/bzip2.c	2006-08-03 09:04:59 UTC (rev 22634)
@@ -224,7 +224,7 @@
 	tmp = OpenTempFile ( dummy , NULL );
 	if ( tmp == NULL )
 		return;
-
+	gtk_widget_set_sensitive (Stop_button, TRUE);
 	msg = g_strdup_printf(_("Decompressing tar file with %s, please wait...") , dummy ? "gzip" : "bzip2");
 	Update_StatusBar ( msg );
 	g_free (msg);
@@ -359,6 +359,7 @@
 		g_free (tmp);
 		return;
 	}
+	gtk_widget_set_sensitive (Stop_button, TRUE);
 	GIOChannel *ioc = g_io_channel_unix_new ( output_fd );
 	g_io_channel_set_encoding (ioc, NULL , NULL);
 	g_io_channel_set_flags ( ioc , G_IO_FLAG_NONBLOCK , NULL );