Make drops on the root window work again. (#145243, Andrew S. Dixon)

2006-02-02  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):
	Make drops on the root window work again.  (#145243, Andrew S. Dixon)

diff --git a/ChangeLog b/ChangeLog
index bac976b37314f2149152c7415251513b87bc879c..1452f04a458d7c45196c610f548fefcb2f0402b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init): Wrap dnd signal

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bac976b37314f2149152c7415251513b87bc879c..1452f04a458d7c45196c610f548fefcb2f0402b6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 e69ea6f6fb10feae33a68db93a59e2c002dd1260..0032af74de764087b118419b292bc827b0cf11a1 100644 (file)
--- 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;
        }