backport previous efm fix

SVN revision: 83415

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 27de5cc80..f14808603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-29 Mike Blumenkrantz
+
+        * fixed bug where dragging files into sidebar would move them instead of creating links
+
 2013-01-23 Mike Blumenkrantz
 
         * module error dialog is no longer remembered across restarts
diff --git a/NEWS b/NEWS
index fe5304953..caad05945 100644
--- a/NEWS
+++ b/NEWS
@@ -45,3 +45,4 @@ Fixes:
     * fixed path setting in import dialog
     * fixed possible NULL deref in desktop editor
     * fixed possible NULL deref in e_sys when debugging
+    * fixed bug where dragging files into sidebar would move them instead of creating links
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 8846b0d7c..fe220a21d 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -6930,7 +6930,7 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event)
           }
         else if (e_drop_handler_action_get() == ECORE_X_ATOM_XDND_ACTION_MOVE)
           {
-             if (sd->config->view.link_drop && (!sd->drop_icon))
+             if (sd->config->view.link_drop)
                lnk = do_lnk = EINA_TRUE;
              else
                do_move = EINA_TRUE;