[Xfce4-commits] [xfce/xfdesktop] 06/19: Always move files from the trash (Bug 3983)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch xfce-4.10
in repository xfce/xfdesktop.

commit 9e03c14e57596324a6d37567729a3dee6b0631b2
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 1503f0b..04ed47a 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -3247,6 +3247,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);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.