]> git.sesse.net Git - vlc/commitdiff
skins2(Linux): fix a drag&drop issue with some sources (konqueror, dolphin)
authorErwan Tulou <erwan10@videolan.org>
Fri, 20 Jul 2012 10:21:41 +0000 (12:21 +0200)
committerErwan Tulou <erwan10@videolan.org>
Fri, 20 Jul 2012 10:48:38 +0000 (12:48 +0200)
This fixes #7165 and can be backported.

modules/gui/skins2/x11/x11_dragdrop.cpp

index e0ca4958bf1f0e7fdf183ec826437a4fd8ca14b9..36ef6b792ab0fdbcb36a428954796357834b7aab 100644 (file)
@@ -104,9 +104,9 @@ void X11DragDrop::dndEnter( ldata_t data )
 void X11DragDrop::dndPosition( ldata_t data )
 {
     Window src = data[0];
-    //Time time = data[3];
     m_xPos = data[2] >> 16;
     m_yPos = data[2] & 0xffff;
+    Time time = data[3];
 
     Atom selectionAtom = XInternAtom( XDISPLAY, "XdndSelection", 0 );
     //Atom targetAtom = XInternAtom( XDISPLAY, "text/plain", 0 );
@@ -119,7 +119,7 @@ void X11DragDrop::dndPosition( ldata_t data )
     // Convert the selection into the given target
     // NEEDED or it doesn't work!
     XConvertSelection( XDISPLAY, selectionAtom, targetAtom, propAtom, src,
-                       CurrentTime );
+                       time );
 
     actionAtom = XInternAtom( XDISPLAY, "XdndActionCopy", 0 );
     typeAtom = XInternAtom( XDISPLAY, "XdndStatus", 0 );