Re: Getting the gui branch to show windows again

[Mark Wielaard <mark at klomp dot org>]

Hi,

On Tue, 2004-10-12 at 20:19, Thomas Fitzsimmons wrote:
> On Tue, 2004-10-12 at 14:16, Mark Wielaard wrote:
> > On Tue, 2004-10-12 at 18:48, Thomas Fitzsimmons wrote:
> > > Could you file a bug for this?
> > Done. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17952
> > 
> > Should I commit my workaround  for now (with a comment pointing to this
> > bug) to get the gui branch working again?
> > 
> Sure.

Checked in as:

2004-10-12  Mark Wielaard  <mark@klomp.org>

        Workaround for bug #17952.
        *  jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (request_frame_extents): Check window->window != NULL.

Cheers,

Mark

Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.24.2.16
diff -u -r1.24.2.16 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	7 Oct 2004 22:11:59 -0000	1.24.2.16
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	12 Oct 2004 19:05:29 -0000
@@ -1,5 +1,5 @@
 /* gtkwindowpeer.c -- Native implementation of GtkWindowPeer
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -413,7 +413,9 @@
 
   /* Check if the current window manager supports
      _NET_REQUEST_FRAME_EXTENTS. */
-  if (gdk_net_wm_supports (request_extents))
+  /* FIXME: The window->window != NULL check is a workaround for bug
+     http://bugzilla.gnome.org/show_bug.cgi?id=17952. */
+  if (gdk_net_wm_supports (request_extents) && window->window != NULL)
     {
       GdkDisplay *display = gtk_widget_get_display (window);
       Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);

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