? asdf
? core.2095
? gdkwindow.prototype.c
? paintqueue.patch
? paintstack.diff
? x11/asdf
? x11/gdkpixmap-x11.ac
? x11/gdkwindow-x11.ac
Index: x11/gdkevents-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v
retrieving revision 1.118
diff -u -p -u -r1.118 gdkevents-x11.c
--- x11/gdkevents-x11.c	11 Aug 2003 16:08:27 -0000	1.118
+++ x11/gdkevents-x11.c	17 Aug 2003 17:04:35 -0000
@@ -814,8 +814,11 @@ gdk_event_translate (GdkDisplay *display
    * are reported same as structure events
    */
   get_real_window (display, xevent, &xwindow, &filter_xwindow);
-  
+
   window = gdk_window_lookup_for_display (display, xwindow);
+  if (xwindow == None)
+      g_assert (window == NULL);
+
   /* We may receive events such as NoExpose/GraphicsExpose
    * and ShmCompletion for pixmaps
    */
Index: x11/gdkwindow-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.c,v
retrieving revision 1.193
diff -u -p -u -r1.193 gdkwindow-x11.c
--- x11/gdkwindow-x11.c	10 Aug 2003 23:37:30 -0000	1.193
+++ x11/gdkwindow-x11.c	17 Aug 2003 17:04:40 -0000
@@ -1525,6 +1525,11 @@ gdk_window_reparent (GdkWindow *window,
 	  GDK_WINDOW_TYPE (window) = GDK_WINDOW_CHILD;
 	  if (impl->toplevel)
 	    {
+	      if (impl->toplevel->focus_window)
+		{
+		  XDestroyWindow (GDK_WINDOW_XDISPLAY (window), impl->toplevel->focus_window);
+		  _gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), impl->toplevel->focus_window);
+		}
 	      gdk_toplevel_x11_free_contents (impl->toplevel);
 	      g_free (impl->toplevel);
 	      impl->toplevel = NULL;
