From c9c48d78bf0032b2ba3b68c3aa1b150239c9fc0d Mon Sep 17 00:00:00 2001 From: Corey Berla Date: Sat, 16 Jul 2022 13:01:31 -0700 Subject: [PATCH] gdkdrop-x11: Fix preferred action gdk_x11_drop_update_actions() sets actions to drop_x11->suggested_action when !drop_x11->xdnd_have_actions and then sets it again to drop_x11->suggested_action if it is. If xdnd_have_actions is true use xdnd_actions. --- gdk/x11/gdkdrop-x11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c index 91987fad13..3f7566d88d 100644 --- a/gdk/x11/gdkdrop-x11.c +++ b/gdk/x11/gdkdrop-x11.c @@ -361,9 +361,9 @@ gdk_x11_drop_update_actions (GdkX11Drop *drop_x11) if (!drop_x11->xdnd_have_actions) actions = drop_x11->suggested_action; else if (drop_x11->suggested_action & GDK_ACTION_ASK) - actions = drop_x11->xdnd_actions & GDK_ACTION_ALL; + actions = drop_x11->xdnd_actions | GDK_ACTION_ASK; else - actions = drop_x11->suggested_action; + actions = drop_x11->xdnd_actions & GDK_ACTION_ALL; gdk_drop_set_actions (GDK_DROP (drop_x11), actions); }