file-roller r2306 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Fri Jun  6 16:40:30 2008
New Revision: 2306
URL: http://svn.gnome.org/viewvc/file-roller?rev=2306&view=rev

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

	* TODO: updated
	
	* configure.in: bumped version number to differentiate 
	current development version from the latest released version.
	
	* src/fr-window.c (open_progress_dialog): 
	
	Return as soon as possible if the dialog is already shown.  
	Don't show the progress bar if open_now is true.

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/configure.in
   trunk/src/fr-window.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Jun  6 16:40:30 2008
@@ -1,10 +1,31 @@
 
-[ ] implement the tree_view context menu commands.
+== ToDo ==
 
 [ ] optimization of the add_folder operation: if the command supports all the
     requested options add the folder directly instead of reading the folder 
     and adding the content in chunks.
 
+[ ] #343201 â Use p7zip for RAR archives?
+
+[ ] #529395 â file-roller will not open 256 AES zip files
+    --> use 7z for zip archives (see #515194 â PK 4.5 Zip files).
+    
+[ ] #525274 â File roller seems to be unable to create zipfiles without .zip extension
+
+[ ] #520844 â File roller not cancelling compression
+
+[ ] #512825 â Fails extraction of files within directories named '.'
+
+[ ] #508737 â can't add file to the archive if archive name is without extension
+
+[ ] #519046 â add x-cbr and x-cbz support
+
+[ ] #521324 â ALZ archive support
+
+== Done ==
+
+[x] implement the tree_view context menu commands.
+
 [x] Add with wildcard.
 	Add with wildcards options :
 	1) Include sub-directories.

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jun  6 16:40:30 2008
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.52)
 
-AC_INIT(file-roller, 2.23.2)
+AC_INIT(file-roller, 2.23.3)
 AC_CONFIG_SRCDIR(src/main.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Fri Jun  6 16:40:30 2008
@@ -2552,10 +2552,11 @@
 		window->priv->progress_timeout = 0;
 	}
 
-	if (window->priv->progress_timeout != 0) 
+	if ((window->priv->progress_timeout != 0) 
+	    || ((window->priv->progress_dialog != NULL) && GTK_WIDGET_VISIBLE (window->priv->progress_dialog))) 
 		return;
 
-	if (! window->priv->batch_mode) 
+	if (! window->priv->batch_mode && ! open_now) 
 		gtk_widget_show (window->priv->progress_bar);
 
 	create_the_progress_dialog (window);
@@ -2686,7 +2687,7 @@
 	
 	switch (action) {
 	case FR_ACTION_EXTRACTING_FILES:
-		open_progress_dialog (window, window->priv->ask_to_open_destination_after_extraction);
+		open_progress_dialog (window, window->priv->ask_to_open_destination_after_extraction || window->priv->convert_data.converting);
 		break;
 	default:
 		open_progress_dialog (window, FALSE);