vlc | branch: master | Erwan Tulou <[email protected]> | Fri Jul 20 12:21:41 2012 +0200| [12d6985fa72cf7327454e432f3b8163f0f79de45] | committer: Erwan Tulou
skins2(Linux): fix a drag&drop issue with some sources (konqueror, dolphin) This fixes #7165 and can be backported. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12d6985fa72cf7327454e432f3b8163f0f79de45 --- modules/gui/skins2/x11/x11_dragdrop.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/skins2/x11/x11_dragdrop.cpp b/modules/gui/skins2/x11/x11_dragdrop.cpp index e0ca495..36ef6b7 100644 --- a/modules/gui/skins2/x11/x11_dragdrop.cpp +++ b/modules/gui/skins2/x11/x11_dragdrop.cpp @@ -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 ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
