From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 1 May 2018 12:35:53 +0000 (+0000)
Subject: Merge branch 'wip/carlosg/controller' into 'master'
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~349
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1dcb76bc2690e604a2fbc81338c654bdac2be7ad;p=gtk4.git

Merge branch 'wip/carlosg/controller' into 'master'

carlosg/controller

See merge request GNOME/gtk!131
---

1dcb76bc2690e604a2fbc81338c654bdac2be7ad
diff --cc gtk/gtkdragsource.c
index 3d228effa6,b13be2e367..8cc461464e
--- a/gtk/gtkdragsource.c
+++ b/gtk/gtkdragsource.c
@@@ -144,9 -145,9 +145,9 @@@ gtk_drag_source_set (GtkWidget         
      {
        site = g_slice_new0 (GtkDragSourceSite);
        site->image_def = gtk_image_definition_new_empty ();
-       site->drag_gesture = gtk_gesture_drag_new (widget);
+       site->drag_gesture = gtk_gesture_drag_new ();
        gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (site->drag_gesture),
 -                                                  GTK_PHASE_BUBBLE);
 +                                                  GTK_PHASE_CAPTURE);
        gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (site->drag_gesture), 0);
        g_signal_connect (site->drag_gesture, "begin",
                          G_CALLBACK (gtk_drag_source_gesture_begin),