nautilus r13750 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Thu Feb 14 10:28:42 2008
New Revision: 13750
URL: http://svn.gnome.org/viewvc/nautilus?rev=13750&view=rev

Log:
2008-02-14  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-file-operations.c:
	ask before emptying the trash or deleting files (#509877)
	Patch from Cosimo Cecchi and Luca Ferretti



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	Thu Feb 14 10:28:42 2008
@@ -1112,6 +1112,31 @@
 }
 
 static gboolean
+confirm_empty_trash (CommonJob *job)
+{
+	char *prompt;
+	int response;
+
+	/* Just Say Yes if the preference says not to confirm. */
+	if (!confirm_trash_auto_value) {
+		return TRUE;
+	}
+
+	prompt = f (_("Empty all of the items from the trash?"));
+
+	response = run_warning (job,
+				prompt,
+				f(_("If you choose to empty the trash, all items "
+				    "in it will be permanently lost. Please note "
+				    "that you can also delete them separately.")),
+				NULL,
+				GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
+				NULL);
+
+	return (response == 1);
+}
+
+static gboolean
 confirm_delete_directly (CommonJob *job,
 			 GList *files)
 {
@@ -4970,11 +4995,13 @@
 	common->io_job = io_job;
 	
 	nautilus_progress_info_start (job->common.progress);
-
-	for (l = job->trash_dirs;
-	     l != NULL && !job_aborted (common);
-	     l = l->next) {
-		delete_trash_file (common, l->data, FALSE, TRUE);
+	
+	if (confirm_empty_trash (common)) {
+		for (l = job->trash_dirs;
+		     l != NULL && !job_aborted (common);
+		     l = l->next) {
+			delete_trash_file (common, l->data, FALSE, TRUE);
+		}
 	}
 
 	g_io_scheduler_job_send_to_mainloop_async (io_job,