Getting the gui branch to show windows again

[Mark Wielaard <mark at klomp dot org>]

Hi,

I updated my gui branch after a week or two and it stopped working.
I use the following patchlet/workaround to get it to show windows again.

--- gnu_java_awt_peer_gtk_GtkWindowPeer.c       7 Oct 2004 22:11:59 -0000       1.24.2.16
+++ gnu_java_awt_peer_gtk_GtkWindowPeer.c       9 Oct 2004 23:23:41 -0000
@@ -413,7 +413,7 @@

   /* Check if the current window manager supports
      _NET_REQUEST_FRAME_EXTENTS. */
-  if (gdk_net_wm_supports (request_extents))
+  if (gdk_net_wm_supports (request_extents) && window->window != NULL)
     {
       GdkDisplay *display = gtk_widget_get_display (window);
       Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);

Without this the followin in GtkWindowPeer fails:
      unsigned long window_id = GDK_WINDOW_XID (GDK_DRAWABLE(window->window));
with
(:6725): Gdk-WARNING **: /home/mark/sources/gtk+/gdk/x11/gdkdrawable-x11.c:912 drawable is not a pixmap or window

Does this make sense to anyone?

Cheers,

Mark

Attachment: signature.asc
Description: This is a digitally signed message part