file-roller r2292 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Mon Jun  2 17:49:14 2008
New Revision: 2292
URL: http://svn.gnome.org/viewvc/file-roller?rev=2292&view=rev

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

	* src/fr-window.c (fr_window_close): do not close if an operation 
	is underway.
	(open_progress_dialog): prefer the progress dialog to the progress 
	bar, maybe not all the users notice the progress bar and think no 
	operation is in progress.
	
	Fixes bug #532255 â file-roller silently allows the user to exit in 
	the middle of an operation.

Modified:
   trunk/ChangeLog
   trunk/src/fr-window.c

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Mon Jun  2 17:49:14 2008
@@ -643,6 +643,9 @@
 void
 fr_window_close (FrWindow *window)
 {
+	if (window->priv->activity_ref > 0) 
+		return;
+		
 	window->priv->closing = TRUE;
 	
 	if (window->priv->check_clipboard != 0) {
@@ -2278,10 +2281,12 @@
 static void
 open_progress_dialog (FrWindow *window)
 {
+	/* FIXME: decide whether to use the progress bar or the dialog when
+	 * not in batch mode.
 	if (! window->priv->batch_mode) {
 		gtk_widget_show (window->priv->progress_bar);
 		return;
-	}
+	}*/
 
 	if (window->priv->hide_progress_timeout != 0) {
 		g_source_remove (window->priv->hide_progress_timeout);