Merge branch 'wip/carlosg/controller' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Tue, 1 May 2018 12:35:53 +0000 (12:35 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 1 May 2018 12:35:53 +0000 (12:35 +0000)
carlosg/controller

See merge request GNOME/gtk!131

1  2 
gtk/gtkdragsource.c
gtk/gtktextview.c

index 3d228effa6ef73dbd73c249a5c4686155bc98eb2,b13be2e367931dfd8112bca65f71a1901d02121f..8cc461464ebd32f14779cbe608cb761dfba7a2ae
@@@ -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),
Simple merge