From afab67f99a6245041fae9f45f959cf25794fdaa7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 2 Feb 2006 20:51:49 +0000 Subject: [PATCH] Make drops on the root window work again. (#145243, Andrew S. Dixon) 2006-02-02 Matthias Clasen * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): Make drops on the root window work again. (#145243, Andrew S. Dixon) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gdk/x11/gdkdnd-x11.c | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bac976b37..1452f04a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-02 Matthias Clasen + + * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): + Make drops on the root window work again. (#145243, Andrew S. Dixon) + 2006-02-01 Matthias Clasen * gtk/gtkwidget.c (gtk_widget_class_init): Wrap dnd signal diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bac976b37..1452f04a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-02-02 Matthias Clasen + + * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): + Make drops on the root window work again. (#145243, Andrew S. Dixon) + 2006-02-01 Matthias Clasen * gtk/gtkwidget.c (gtk_widget_class_init): Wrap dnd signal diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index e69ea6f6f..0032af74d 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -3035,7 +3035,13 @@ _gdk_drag_get_protocol_for_display (GdkDisplay *display, GDK_NOTE (DND, g_message ("Entering local Xdnd window %#x\n", xid)); return xid; } - else + else if (_gdk_x11_display_is_root_window (display, (Window) xid)) + { + *protocol = GDK_DRAG_PROTO_ROOTWIN; + GDK_NOTE (DND, g_message ("Entering root window\n")); + return xid; + } + return None; } @@ -3103,6 +3109,7 @@ _gdk_drag_get_protocol_for_display (GdkDisplay *display, if (rootwin) { + GDK_NOTE (DND, g_message ("Entering root window\n")); *protocol = GDK_DRAG_PROTO_ROOTWIN; return xid; }