From: Po Lu Date: Thu, 15 Sep 2022 07:30:32 +0000 (+0800) Subject: More fixes for XDND proxy support X-Git-Tag: emacs-29.0.90~1856^2~491 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=429e61b130232e69531f7d44b2bc610d43c8217d;p=emacs.git More fixes for XDND proxy support * src/xterm.c (handle_one_xevent): Check replies against toplevel, not proxy. --- diff --git a/src/xterm.c b/src/xterm.c index 96d25b26434..4c3b8128175 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -17676,7 +17676,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, if (x_dnd_last_protocol_version != -1 && x_dnd_in_progress - && target == x_dnd_last_seen_window + && target == x_dnd_last_seen_toplevel /* The XDND documentation is not very clearly worded. But this should be the correct behavior, since "kDNDStatusSendHereFlag" in the reference @@ -20377,7 +20377,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, else if (x_dnd_last_seen_window != None && x_dnd_last_protocol_version != -1) { - x_dnd_pending_finish_target = x_dnd_last_seen_window; + x_dnd_pending_finish_target = x_dnd_last_seen_toplevel; x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version; x_dnd_waiting_for_finish @@ -21914,7 +21914,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, else if (x_dnd_last_seen_window != None && x_dnd_last_protocol_version != -1) { - x_dnd_pending_finish_target = x_dnd_last_seen_window; + x_dnd_pending_finish_target = x_dnd_last_seen_toplevel; x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version; x_dnd_waiting_for_finish