[gthumb] fixed trash task not working properly



commit 90b5832bdcfb9f0349bfa1e38fa63422290b42dc
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Mar 1 17:11:35 2015 +0100

    fixed trash task not working properly

 gthumb/gio-utils.c           |    1 +
 gthumb/gth-file-source-vfs.c |    3 ++-
 gthumb/gth-trash-task.c      |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gthumb/gio-utils.c b/gthumb/gio-utils.c
index bc3ae0a..5fcb384 100644
--- a/gthumb/gio-utils.c
+++ b/gthumb/gio-utils.c
@@ -2086,6 +2086,7 @@ _g_trash_files_async (GList        *file_list, /* GFile list */
        tdata->callback = callback;
        tdata->user_data = user_data;
 
+       tdata->current = tdata->file_list;
        trash_files__delete_current (tdata);
 }
 
diff --git a/gthumb/gth-file-source-vfs.c b/gthumb/gth-file-source-vfs.c
index e4372f9..fddf655 100644
--- a/gthumb/gth-file-source-vfs.c
+++ b/gthumb/gth-file-source-vfs.c
@@ -31,6 +31,7 @@
 #include "gth-file-source-vfs.h"
 #include "gth-main.h"
 #include "gth-preferences.h"
+#include "gth-trash-task.h"
 #include "gtk-utils.h"
 
 #define GTH_MONITOR_N_EVENTS 3
@@ -768,7 +769,7 @@ gth_file_mananger_trash_files (GtkWindow *window,
        tdata->window = window;
        tdata->files = gth_file_data_list_to_file_list (file_list);
 
-       task = gth_delete_task_new (tdata->files);
+       task = gth_trash_task_new (tdata->files);
        g_signal_connect (task,
                          "completed",
                          trash_task_completed_cb,
diff --git a/gthumb/gth-trash-task.c b/gthumb/gth-trash-task.c
index 7912fd4..19edfc1 100644
--- a/gthumb/gth-trash-task.c
+++ b/gthumb/gth-trash-task.c
@@ -61,7 +61,7 @@ gth_trash_task_exec (GthTask *task)
 
        self = GTH_TRASH_TASK (task);
 
-       gth_task_progress (task, _("Deleting files"), NULL, TRUE, 0.0);
+       gth_task_progress (task, _("Moving files to trash"), NULL, TRUE, 0.0);
 
        _g_trash_files_async (self->priv->file_list,
                              gth_task_get_cancellable (task),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]