[EGIT] [core/enlightenment] master 04/21: bugfix: efm dnd to external windows

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=3e0cbdc4416f910342347dacdc980008dcc4bcf0

commit 3e0cbdc4416f910342347dacdc980008dcc4bcf0
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Jan 22 15:59:30 2014 -0500

    bugfix: efm dnd to external windows
    
    deleting the drag at this point deletes the window which owns the current 
selection, guaranteeing that the operation will fail
    
    T797
---
 src/bin/e_dnd.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index c6c2627..fc34277 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -954,9 +954,6 @@ _e_drag_end(int x, int y)
           _drag_current->cb.finished(_drag_current, dropped);
         _drag_current->cb.finished = NULL;
 
-        if (_drag_current && (!_xdnd))
-          e_object_del(E_OBJECT(_drag_current));
-        //e_grabinput_release(_drag_win, _drag_win);
         return;
      }
 
@@ -1332,8 +1329,8 @@ _e_dnd_cb_event_dnd_finished(void *data __UNUSED__, int 
type __UNUSED__, void *e
    if (!ev->completed) return ECORE_CALLBACK_PASS_ON;
  */
 
-   if (_drag_win) ecore_x_window_free(_drag_win);
-   _drag_win = 0;
+   if (_drag_current && (!_xdnd))
+     e_object_del(E_OBJECT(_drag_current));
    return ECORE_CALLBACK_PASS_ON;
 }
 

--