[Xfce4-commits] <xfdesktop:master> Always move files from the trash (Bug 3983)

[Eric Koegel]

Updating branch refs/heads/master
         to 312098a1d9ba81cc588d7d121587c14e35728eed (commit)
       from 5eb24adb0f1ca7ef072552d83fdc04bb8044f96b (commit)

commit 312098a1d9ba81cc588d7d121587c14e35728eed
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Oct 28 14:21:38 2013 +0300

    Always move files from the trash (Bug 3983)

 src/xfdesktop-file-icon-manager.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index a4432cb..7b6a8d8 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -3527,6 +3527,12 @@ xfdesktop_file_icon_manager_propose_drop_action(XfdesktopIconViewManager *manage
         if(file_list) {
             GFile *base_dest_file = NULL;
 
+            /* always move files from the trash */
+            if(g_file_has_uri_scheme(file_list->data, "trash")) {
+                xfdesktop_file_utils_file_list_free(file_list);
+                return GDK_ACTION_MOVE;
+            }
+
             /* source must be local file */
             if(!g_file_has_uri_scheme(file_list->data, "file")) {
                 xfdesktop_file_utils_file_list_free(file_list);