[gtk/matthiasc/for-master: 7/9] wayland: Fix dnd action handling

[Matthias Clasen <matthiasc src gnome org>]

commit e3c4471cc025e7efdb2621642a37c09345196b28
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jan 4 09:16:26 2020 -0500

    wayland: Fix dnd action handling
    
    When updating GdkDrop::actions from changes sent by
    the compositor, we were inadvertently setting them to 0,
    causing drops to appear impossible.

 gdk/wayland/gdkdrop-wayland.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c
index 3e0a25deaa..686157fd81 100644
--- a/gdk/wayland/gdkdrop-wayland.c
+++ b/gdk/wayland/gdkdrop-wayland.c
@@ -288,7 +288,8 @@ gdk_wayland_drop_update_actions (GdkWaylandDrop *drop)
   GdkDragAction gdk_actions = 0;
   uint32_t wl_actions;
 
-  if (drop->action & WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
+  if (drop->action == 0 ||
+      drop->action & WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
     wl_actions = drop->source_actions;
   else
     wl_actions = drop->action;