When setting up the drag cursor as a shaped window, make sure to hide the previous...

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index b29bbcf2fdbeb6fae72df7fa387c1b86aff1c9f6..2dca54a8b7c79c1891781f02a3791864174534cd 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -45,9 +45,15 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
 
   g_list_free(gdk_dnd.c->xids); gdk_dnd.c->xids = NULL;
   if(gdk_dnd.c->drag_pm_default)
-    gdk_window_unref(gdk_dnd.c->drag_pm_default);
+    {
+      gdk_window_hide(gdk_dnd.c->drag_pm_default);
+      gdk_window_unref(gdk_dnd.c->drag_pm_default);
+    }
   if(gdk_dnd.c->drag_pm_ok)
-    gdk_window_unref(gdk_dnd.c->drag_pm_ok);
+    {
+      gdk_window_hide(gdk_dnd.c->drag_pm_ok);
+      gdk_window_unref(gdk_dnd.c->drag_pm_ok);
+    }
 
   gdk_dnd.c->drag_pm_ok = NULL;
 

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index b29bbcf2fdbeb6fae72df7fa387c1b86aff1c9f6..2dca54a8b7c79c1891781f02a3791864174534cd 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -45,9 +45,15 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
 
   g_list_free(gdk_dnd.c->xids); gdk_dnd.c->xids = NULL;
   if(gdk_dnd.c->drag_pm_default)
-    gdk_window_unref(gdk_dnd.c->drag_pm_default);
+    {
+      gdk_window_hide(gdk_dnd.c->drag_pm_default);
+      gdk_window_unref(gdk_dnd.c->drag_pm_default);
+    }
   if(gdk_dnd.c->drag_pm_ok)
-    gdk_window_unref(gdk_dnd.c->drag_pm_ok);
+    {
+      gdk_window_hide(gdk_dnd.c->drag_pm_ok);
+      gdk_window_unref(gdk_dnd.c->drag_pm_ok);
+    }
 
   gdk_dnd.c->drag_pm_ok = NULL;