commit 461e9cc64b5a6e9943db397d27c6415327386494
author Caolán McNamara <caolanm@redhat.com> Tue Oct 25 09:38:36 2016 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Oct 25 09:39:28 2016 +0100
tree f7af87654ed4b9be2dac0641b3a53d25e160793d
parent 250252d02bac88877845a4bc27e3f1837f1312ba

Resolves: tdf#103472 gtk3 dnd must clear listener after dragDropEnd dispatch

like the generic dnd impl does

Change-Id: Ie860c43329ee2f9332d12a53cd691ac7fcbb5eac

vcl/unx/gtk3/gtk3gtkframe.cxx

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index e5ddb07..08dd543 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4149,10 +4149,15 @@ void GtkSalFrame::startDrag(gint nButton, gint nDragOriginX, gint nDragOriginY,

void GtkDragSource::dragFailed()
{
    datatransfer::dnd::DragSourceDropEvent aEv;
    aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_NONE;
    aEv.DropSuccess = false;
    m_xListener->dragDropEnd(aEv);
    if (m_xListener.is())
    {
        datatransfer::dnd::DragSourceDropEvent aEv;
        aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_NONE;
        aEv.DropSuccess = false;
        auto xListener = m_xListener;
        m_xListener.clear();
        xListener->dragDropEnd(aEv);
    }
}

gboolean GtkSalFrame::signalDragFailed(GtkWidget* /*widget*/, GdkDragContext* /*context*/, GtkDragResult /*result*/, gpointer frame)
@@ -4166,10 +4171,15 @@ gboolean GtkSalFrame::signalDragFailed(GtkWidget* /*widget*/, GdkDragContext* /*

void GtkDragSource::dragDelete()
{
    datatransfer::dnd::DragSourceDropEvent aEv;
    aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_MOVE;
    aEv.DropSuccess = true;
    m_xListener->dragDropEnd(aEv);
    if (m_xListener.is())
    {
        datatransfer::dnd::DragSourceDropEvent aEv;
        aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_MOVE;
        aEv.DropSuccess = true;
        auto xListener = m_xListener;
        m_xListener.clear();
        xListener->dragDropEnd(aEv);
    }
}

void GtkSalFrame::signalDragDelete(GtkWidget* /*widget*/, GdkDragContext* /*context*/, gpointer frame)
@@ -4182,10 +4192,15 @@ void GtkSalFrame::signalDragDelete(GtkWidget* /*widget*/, GdkDragContext* /*cont

void GtkDragSource::dragEnd(GdkDragContext* context)
{
    datatransfer::dnd::DragSourceDropEvent aEv;
    aEv.DropAction = GdkToVcl(gdk_drag_context_get_selected_action(context));
    aEv.DropSuccess = gdk_drag_drop_succeeded(context);
    m_xListener->dragDropEnd(aEv);
    if (m_xListener.is())
    {
        datatransfer::dnd::DragSourceDropEvent aEv;
        aEv.DropAction = GdkToVcl(gdk_drag_context_get_selected_action(context));
        aEv.DropSuccess = gdk_drag_drop_succeeded(context);
        auto xListener = m_xListener;
        m_xListener.clear();
        xListener->dragDropEnd(aEv);
    }
    g_ActiveDragSource = nullptr;
}