nautilus r14015 - in trunk: . libnautilus-private

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Apr  1 00:47:28 2008
New Revision: 14015
URL: http://svn.gnome.org/viewvc/nautilus?rev=14015&view=rev

Log:
2008-04-01  Cosimo Cecchi  <cosimoc gnome org>

	* libnautilus-private/nautilus-file-operations.c:
	(nautilus_file_operations_unmount_mount), (empty_trash_job),
	(nautilus_file_operations_empty_trash):
	Do not ask twice if we want to empty the trash when unmounting
	a volume. (#525269).


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Tue Apr  1 00:47:28 2008
@@ -125,6 +125,7 @@
 typedef struct {
 	CommonJob common;
 	GList *trash_dirs;
+	gboolean should_confirm;
 	NautilusOpCallback done_callback;
 	gpointer done_callback_data;
 } EmptyTrashJob;
@@ -1986,6 +1987,7 @@
 			EmptyTrashJob *job;
 			
 			job = op_job_new (EmptyTrashJob, parent_window);
+			job->should_confirm = FALSE;
 			job->trash_dirs = get_trash_dirs_for_mount (mount);
 			job->done_callback = (NautilusOpCallback)do_unmount;
 			job->done_callback_data = data;
@@ -5073,13 +5075,19 @@
 	EmptyTrashJob *job = user_data;
 	CommonJob *common;
 	GList *l;
+	gboolean confirmed;
 	
 	common = (CommonJob *)job;
 	common->io_job = io_job;
 	
 	nautilus_progress_info_start (job->common.progress);
-	
-	if (confirm_empty_trash (common)) {
+
+	if (job->should_confirm) {
+		confirmed = confirm_empty_trash (common);
+	} else {
+		confirmed = TRUE;
+	}
+	if (confirmed) {
 		for (l = job->trash_dirs;
 		     l != NULL && !job_aborted (common);
 		     l = l->next) {
@@ -5109,6 +5117,7 @@
 	job = op_job_new (EmptyTrashJob, parent_window);
 	job->trash_dirs = g_list_prepend (job->trash_dirs,
 					  g_file_new_for_uri ("trash:"));
+	job->should_confirm = TRUE;
 	
 	g_io_scheduler_push_job (empty_trash_job,
 			   job,