summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2008-05-31 12:59:39 +0000
committerCosimo Cecchi <cosimoc@src.gnome.org>2008-05-31 12:59:39 +0000
commit58a55d38bc90d6c276082d38aa70b2cf9b199ff1 (patch)
tree094ba6fd94cf948fc5c0a3de5184780ae916e351
parentcebbbe5d78777e9c6b40bd6d5ad295e5e3f95a4d (diff)
downloadnautilus-58a55d38bc90d6c276082d38aa70b2cf9b199ff1.tar.gz
Call setup_autos() to have the confirmation preference var always
2008-05-31 Cosimo Cecchi <cosimoc@gnome.org> * libnautilus-private/nautilus-file-operations.c: (nautilus_file_operations_empty_trash): Call setup_autos() to have the confirmation preference var always initializated properly. Patch by Kai Willadsen (#535182). svn path=/trunk/; revision=14217
-rw-r--r--ChangeLog7
-rw-r--r--libnautilus-private/nautilus-file-operations.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d12747746..4f8ff75b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-31 Cosimo Cecchi <cosimoc@gnome.org>
+
+ * libnautilus-private/nautilus-file-operations.c:
+ (nautilus_file_operations_empty_trash):
+ Call setup_autos() to have the confirmation preference var
+ always initializated properly. Patch by Kai Willadsen (#535182).
+
Sat May 31 03:20:11 2008 Søren Sandmann <sandmann@redhat.com>
* libnautilus-private/nautilus-directory-background.c
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 30961f0eb..004c45708 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -5381,6 +5381,8 @@ nautilus_file_operations_empty_trash (GtkWidget *parent_view)
parent_window = (GtkWindow *)gtk_widget_get_ancestor (parent_view, GTK_TYPE_WINDOW);
}
+ setup_autos ();
+
job = op_job_new (EmptyTrashJob, parent_window);
job->trash_dirs = g_list_prepend (job->trash_dirs,
g_file_new_for_uri ("trash:"));