File gtk.patch of Package nvu
From: Wolfgang Rosenauer <stark@suse.de>
Subject: Fixes for newer versions of GTK
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=300226
Index: gtk/nsScreenGtk.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsScreenGtk.cpp,v
retrieving revision 1.20
diff -p -U4 -r1.20 nsScreenGtk.cpp
--- gtk/nsScreenGtk.cpp 23 Jul 2004 14:42:29 -0000 1.20
+++ gfx/src/gtk/nsScreenGtk.cpp 29 Jun 2005 11:10:01 -0000
@@ -138,12 +138,13 @@ nsScreenGtk :: Init ()
#endif
gdk_error_trap_push();
+ // gdk_property_get uses (length + 3) / 4, hence G_MAXLONG - 3 here.
if (!gdk_property_get(root_window,
gdk_atom_intern ("_NET_WORKAREA", FALSE),
cardinal_atom,
- 0, G_MAXLONG, FALSE,
+ 0, G_MAXLONG - 3, FALSE,
&type_returned,
&format_returned,
&length_returned,
(guchar **) &workareas)) {
Index: mozdrawingarea.c
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/mozdrawingarea.c,v
retrieving revision 1.13
diff -p -u -u -p -U10 -r1.13 mozdrawingarea.c
--- mozdrawingarea.c 27 Jan 2005 20:49:45 -0000 1.13
+++ widget/src/gtk2/mozdrawingarea.c 9 Jul 2005 23:19:59 -0000
@@ -161,21 +161,23 @@ moz_drawingarea_create_windows (MozDrawi
void
moz_drawingarea_finalize (GObject *object)
{
MozDrawingarea *drawingarea;
g_return_if_fail(IS_MOZ_DRAWINGAREA(object));
drawingarea = MOZ_DRAWINGAREA(object);
+ gdk_window_set_user_data(drawingarea->inner_window, NULL);
gdk_window_destroy(drawingarea->inner_window);
+ gdk_window_set_user_data(drawingarea->clip_window, NULL);
gdk_window_destroy(drawingarea->clip_window);
(* parent_class->finalize) (object);
}
void
moz_drawingarea_move (MozDrawingarea *drawingarea,
gint x, gint y)
{
gdk_window_move(drawingarea->clip_window, x, y);