2006-05-29 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD to generics-branch (2006-05-20 to 2006-05-29)

14 files changed, 487 insertions, 1313 deletions

diff --git a/native/jawt/Makefile.am b/native/jawt/Makefile.am
index b6e6f0af0..30e5a345b 100644
--- a/native/jawt/Makefile.am
+++ b/native/jawt/Makefile.am
@@ -1,16 +1,12 @@
-nativeexeclib_LTLIBRARIES = libjawtgnu.la
+nativeexeclib_LTLIBRARIES = libjawt.la
 
-libjawtgnu_la_SOURCES = jawt.c
-libjawtgnu_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
-# FIXME: libtool doesn't allow overriding SONAME, but we need to set
-# it to libjawt.so for binary compatibility.
-#
-# libjawtgnu_la_LDFLAGS = -Wl,-soname -Wl,libjawt.so
+libjawt_la_SOURCES = jawt.c
+libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
 
-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
 # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk
 # headers contain broken prototypes (by design, see gtkitemfactory.h).
 AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \
-            @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@
+            @GTK_CFLAGS@ @PANGOFT2_CFLAGS@
diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am
index 9c373cb4d..4b113c978 100644
--- a/native/jni/gtk-peer/Makefile.am
+++ b/native/jni/gtk-peer/Makefile.am
@@ -1,17 +1,9 @@
 nativeexeclib_LTLIBRARIES = libgtkpeer.la
 
-# Gtk/Cairo JNI sources.
-if GTK_CAIRO
-  gtk_cairo_c_source_files = \
-    gnu_java_awt_peer_gtk_GdkGraphics2D.c
-else
-  gtk_cairo_c_source_files =
-endif
-
-libgtkpeer_la_SOURCES = $(gtk_cairo_c_source_files) \
-			gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
+# GTK JNI sources.
+libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
 			gnu_java_awt_peer_gtk_GdkFontPeer.c \
-			gnu_java_awt_peer_gtk_GdkGraphics.c \
+			gnu_java_awt_peer_gtk_GdkGraphics2D.c \
 			gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \
 			gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
 			gnu_java_awt_peer_gtk_GdkRobotPeer.c \
@@ -47,19 +39,18 @@ libgtkpeer_la_SOURCES = $(gtk_cairo_c_source_files) \
 			gthread-jni.c \
 			gdkfont.h \
 			gthread-jni.h \
-			gtkcairopeer.h \
 			gtk_jawt.c \
 			gtkpeer.h
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
 		       $(top_builddir)/native/jni/classpath/jcl.lo
 
-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @FREETYPE2_LIBS@ \
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
 # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk
 # headers contain broken prototypes (by design, see gtkitemfactory.h).
 AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \
-            @GTK_CFLAGS@ @CAIRO_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \
+            @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \
             @X_CFLAGS@
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
index 0726fb531..c0f776b20 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
@@ -35,6 +35,13 @@
    obligated to do so.  If you do not wish to do so, delete this
    exception statement from your version. */
 
+#include <pango/pango.h>
+#include <pango/pangoft2.h>
+#include <pango/pangofc-font.h>
+#include <freetype/ftglyph.h>
+#include <freetype/ftoutln.h>
+#include <freetype/fttypes.h>
+#include <freetype/tttables.h>
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
 
@@ -389,7 +396,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTextMetrics
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont
-  (JNIEnv *env, jobject self, jstring family_name_str, jint style_int, jint size, jboolean useGraphics2D)
+  (JNIEnv *env, jobject self, jstring family_name_str, jint style_int, jint size)
 {
   struct peerfont *pfont = NULL;
   char const *family_name = NULL;
@@ -426,22 +433,11 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont
   if (style & java_awt_font_ITALIC)
     pango_font_description_set_style (pfont->desc, PANGO_STYLE_ITALIC);
 
-  if (useGraphics2D)
+  pango_font_description_set_size (pfont->desc, size * PANGO_SCALE);
+  if (pfont->ctx == NULL)
     {
-      pango_font_description_set_size (pfont->desc, size * PANGO_SCALE);
-      if (pfont->ctx == NULL)
-	{
-	  ft2_map = PANGO_FT2_FONT_MAP(pango_ft2_font_map_for_display ());
-	  pfont->ctx = pango_ft2_font_map_create_context (ft2_map);
-	}
-    }
-  else
-    {
-      /* GDK uses a slightly different DPI setting. */
-      pango_font_description_set_size (pfont->desc,
-				   size * cp_gtk_dpi_conversion_factor);
-      if (pfont->ctx == NULL)
-	pfont->ctx = gdk_pango_context_get();
+      ft2_map = PANGO_FT2_FONT_MAP(pango_ft2_font_map_for_display ());
+      pfont->ctx = pango_ft2_font_map_create_context (ft2_map);
     }
 
   g_assert (pfont->ctx != NULL);
@@ -465,3 +461,64 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont
 }
 
 
+JNIEXPORT jbyteArray JNICALL 
+Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable 
+  (JNIEnv *env, jobject self, jbyte n, jbyte a, jbyte m, jbyte e)
+{
+  struct peerfont *pfont = NULL;
+  FT_Face face;
+  FT_ULong length = 0;
+  FT_ULong tag;
+  int error;
+  FT_Byte *buffer;
+  jbyteArray result_array;
+  jbyte *rbuf;
+
+  pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, self);
+  if(pfont == NULL)
+    return NULL;
+
+  gdk_threads_enter ();
+  face = pango_fc_font_lock_face ((PangoFcFont *)pfont->font);
+  tag = FT_MAKE_TAG( n, a, m, e );
+
+  /* Get the length of the table requested */
+  error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
+  if ( error ) 
+    {
+      pango_fc_font_unlock_face ((PangoFcFont *)pfont->font);
+      gdk_threads_leave ();
+      return NULL;
+    }
+
+  buffer = (FT_Byte *)g_malloc0( length );
+  if ( buffer == NULL ) 
+    {
+      pango_fc_font_unlock_face ((PangoFcFont *)pfont->font);
+      gdk_threads_leave ();
+      return NULL;
+    }
+  /* get the table data */
+  error = FT_Load_Sfnt_Table( face, tag, 0, buffer, &length );
+  if ( error ) 
+    {
+      pango_fc_font_unlock_face ((PangoFcFont *)pfont->font);
+      g_free(buffer);
+      gdk_threads_leave ();
+      return NULL;
+    }
+
+  /* copy to a jbytearray */
+  result_array = (*env)->NewByteArray (env, length);
+
+  rbuf = (*env)->GetByteArrayElements (env, result_array, NULL);
+  memcpy(rbuf, buffer, length);
+  (*env)->ReleaseByteArrayElements (env, result_array, rbuf, 0);
+
+  g_free(buffer);
+  pango_fc_font_unlock_face ((PangoFcFont *)pfont->font);
+  gdk_threads_leave ();
+
+  /* done */
+  return result_array;
+}
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
deleted file mode 100644
index 29bc1855b..000000000
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
+++ /dev/null
@@ -1,758 +0,0 @@
-/* gdkgraphics.c
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-#include "gtkpeer.h"
-#include "gdkfont.h"
-#include "gnu_java_awt_peer_gtk_GdkGraphics.h"
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-
-static jmethodID initComponentGraphicsUnlockedID;
-
-/*
- * AWT applications may call Graphics methods from threads other than
- * the GDK main thread, so we must call XFlush after each batch of
- * drawing operations, otherwise animations flicker.  Flushing after
- * every graphics operation is excessive and negatively affects
- * performance (PR 26486).  We set the maximum frequency to 50 times
- * per second, or a minimum period of 20 milliseconds between calls to
- * XFlush.  See gnu.classpath.examples.awt.AnimationApplet for an
- * example applet that requires these XFlush calls.
- */
-
-static short flush_scheduled = 0;
-
-static gboolean flush (gpointer data __attribute__((unused)))
-{
-  gdk_threads_enter ();
-
-  XFlush (GDK_DISPLAY ());
-  flush_scheduled = 0;
-
-  gdk_threads_leave ();
-
-  return FALSE;
-}
-
-/* The minimum time period between calls to XFlush, in
-   milliseconds. */
-#define MINIMUM_FLUSH_PERIOD 20
-
-/* schedule_flush must be called with the GDK lock held. */
-static void
-schedule_flush ()
-{
-  if (!flush_scheduled)
-    {
-      g_timeout_add (MINIMUM_FLUSH_PERIOD, flush, NULL);
-      flush_scheduled = 1;
-    }
-}
-
-void
-cp_gtk_graphics_init_jni (void)
-{
-  jclass gdkgraphics;
-
-  gdkgraphics = (*cp_gtk_gdk_env())->FindClass (cp_gtk_gdk_env(),
-                                         "gnu/java/awt/peer/gtk/GdkGraphics");
-
-  initComponentGraphicsUnlockedID =
-    (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), gdkgraphics,
-                                      "initComponentGraphicsUnlocked",
-                                      "()V");
-}
-
-struct state_table *cp_gtk_native_graphics_state_table;
-
-static struct state_table *native_graphics_global_ref_table;
-
-#define NSA_GLOBAL_G_INIT(env, clazz) \
-  native_graphics_global_ref_table = cp_gtk_init_state_table (env, clazz)
-
-#define NSA_GET_GLOBAL_G_REF(env, obj) \
-  cp_gtk_get_state (env, obj, native_graphics_global_ref_table)
-
-#define NSA_SET_GLOBAL_G_REF(env, obj) \
-  do {jobject *globRefPtr; \
-    globRefPtr = (jobject *) malloc (sizeof (jobject)); \
-    *globRefPtr = (*env)->NewGlobalRef (env, obj); \
-    cp_gtk_set_state (env, obj, native_graphics_global_ref_table, (void *)globRefPtr);} while (0)
-
-#define NSA_DEL_GLOBAL_G_REF(env, obj) \
-  do {jobject *globRefPtr = cp_gtk_get_state (env, obj, native_graphics_global_ref_table); \
-    cp_gtk_remove_state_slot (env, obj, native_graphics_global_ref_table); \
-    (*env)->DeleteGlobalRef (env, *globRefPtr); \
-    free (globRefPtr);} while (0)
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_initStaticState
-  (JNIEnv *env, jclass clazz)
-{
-   gdk_threads_enter();
-
-   NSA_G_INIT (env, clazz);
-   NSA_GLOBAL_G_INIT (env, clazz);
-
-   gdk_threads_leave();
-}
-
-#define GDK_STABLE_IS_PIXMAP(d) (GDK_IS_PIXMAP(d))
-
-static GdkPoint *translate_points (JNIEnv *env, jintArray xpoints,
-                                   jintArray ypoints, jint npoints,
-                                   jint x_offset, jint y_offset);
-static void realize_cb (GtkWidget *widget, jobject jgraphics);
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_nativeCopyState
-  (JNIEnv *env, jobject obj, jobject old)
-{
-  struct graphics *g = NULL;
-  struct graphics *g_old = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) g_malloc (sizeof (struct graphics));
-  g_old = (struct graphics *) NSA_GET_G_PTR (env, old);
-
-  *g = *g_old;
-
-  g->gc = gdk_gc_new (g->drawable);
-  gdk_gc_copy (g->gc, g_old->gc);
-
-  if (GDK_STABLE_IS_PIXMAP (g->drawable))
-    g_object_ref (g->drawable);
-  else /* GDK_IS_WINDOW (g->drawable) */
-    g_object_ref (g->drawable);
-
-  if (g->cm != NULL)
-    g_object_ref (g->cm);
-
-  NSA_SET_G_PTR (env, obj, g);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II
-  (JNIEnv *env, jobject obj, jint width, jint height)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) g_malloc (sizeof (struct graphics));
-  g->x_offset = g->y_offset = 0;
-
-  g->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, 
-						gdk_rgb_get_visual ()->depth);
-  g->cm = gdk_rgb_get_colormap ();
-  
-  if (g->cm != NULL)
-    g_object_ref (g->cm);
-  g->gc = gdk_gc_new (g->drawable);
-
-  NSA_SET_G_PTR (env, obj, g);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_initFromImage
-   (JNIEnv *env, jobject obj, jobject source)
-{
-  struct graphics *g = NULL;
-  GdkPixmap *pixmap = NULL;
-
-  gdk_threads_enter ();
-
-  pixmap = cp_gtk_image_get_pixmap (env, source);
-  g_assert(pixmap != NULL);
-  g_object_ref (pixmap);
-
-  g = (struct graphics *) g_malloc (sizeof (struct graphics));
-  g->x_offset = g->y_offset = 0;
-
-  g->drawable = (GdkDrawable *)pixmap;
-
-  g->cm = gdk_drawable_get_colormap (g->drawable);
-  
-  if (g->cm != NULL)
-    g_object_ref (g->cm);
-  g->gc = gdk_gc_new (g->drawable);
-
-  NSA_SET_G_PTR (env, obj, g);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_initStateUnlocked
-  (JNIEnv *env, jobject obj, jobject peer)
-{
-  struct graphics *g = NULL;
-  void *ptr = NULL;
-  GtkWidget *widget = NULL;
-  GdkColor color;
-
-  g = (struct graphics *) g_malloc (sizeof (struct graphics));
-  ptr = NSA_GET_PTR (env, peer);
-  g->x_offset = 0;
-  g->y_offset = 0;
-
-  widget = GTK_WIDGET (ptr);
-  g->drawable = (GdkDrawable *) widget->window;
-
-  g_object_ref (g->drawable);
-  g->cm = gtk_widget_get_colormap (widget);
-  
-  if (g->cm != NULL)
-    g_object_ref (g->cm);
-    
-  g->gc = gdk_gc_new (g->drawable);
-  gdk_gc_copy (g->gc, widget->style->fg_gc[GTK_STATE_NORMAL]);
-  color = widget->style->fg[GTK_STATE_NORMAL];
-
-  NSA_SET_G_PTR (env, obj, g);
-}
-
-/* copy the native state of the peer (GtkWidget *) to the native state
-   of the graphics object */
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
-  (JNIEnv *env, jobject obj, jobject peer)
-{
-  gdk_threads_enter ();
-  Java_gnu_java_awt_peer_gtk_GdkGraphics_initStateUnlocked
-    (env, obj, peer);
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_connectSignals
-  (JNIEnv *env, jobject obj, jobject peer)
-{
-  void *ptr = NULL;
-  jobject *gref = NULL;
-
-  gdk_threads_enter ();
-
-  NSA_SET_GLOBAL_G_REF (env, obj);
-  gref = NSA_GET_GLOBAL_G_REF (env, obj);
-
-  ptr = NSA_GET_PTR (env, peer);
-
-  g_signal_connect_after (G_OBJECT (ptr), "realize",
-                          G_CALLBACK (realize_cb), *gref);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_nativeDispose
-  (JNIEnv *env, jobject obj)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_DEL_G_PTR (env, obj);
-
-  /* check if dispose has been called already */
-  if (!g)
-    {
-      gdk_threads_leave ();
-      return;
-    }
-
-  XFlush (GDK_DISPLAY ());
-  
-  if (g->gc != NULL)
-    g_object_unref (g->gc);
-
-  if (GDK_STABLE_IS_PIXMAP (g->drawable))
-    g_object_unref (g->drawable);
-  else if (g->drawable != NULL)
-    g_object_unref (g->drawable);
-
-  if (g->cm != NULL)
-    g_object_unref (g->cm);
-
-  g_free (g);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_translateNative
-  (JNIEnv *env, jobject obj, jint x, jint y)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  g->x_offset += x;
-  g->y_offset += y;
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString
-  (JNIEnv *env, jobject obj, jobject font, jstring str, jint x, jint y)
-{
-  struct peerfont *pfont = NULL;
-  struct graphics *g = NULL;
-  const char *cstr = NULL;
-  const char *sTmp = NULL;
-  char *tmp = NULL;
-  char *p = NULL;
-  int count = 0;
-  int charSize = 0;
-  int baseline_y = 0;
-  PangoLayoutIter *iter = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-  g_assert (g != NULL);
-
-  pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
-  g_assert (pfont != NULL);
-
-  cstr = (*env)->GetStringUTFChars (env, str, NULL);
-  g_assert (cstr != NULL);  
-  
-  charSize = sizeof(char);
-  p = malloc((strlen(cstr) + 1) * charSize);
-  g_assert (p != NULL);  
-
-  tmp = p;
-  sTmp = cstr;
-  for (; *sTmp != '\0'; sTmp++)
-    if (((unsigned char) *sTmp) >= ' ')
-      {
-        *p = *sTmp;
-        count++;
-        p++;
-      }
-  *p = '\0';
-
-  p = realloc(tmp, (count + 1) * charSize);
-  g_assert (p != NULL);
-  pango_layout_set_text (pfont->layout, p, -1);
-  free(p);
-
-  pango_layout_set_font_description (pfont->layout, pfont->desc);
-  iter = pango_layout_get_iter (pfont->layout);
-
-  baseline_y = pango_layout_iter_get_baseline (iter);
-
-  gdk_draw_layout (g->drawable, g->gc,
-                   x + g->x_offset,
-                   y + g->y_offset - PANGO_PIXELS (baseline_y),
-                   pfont->layout);
-
-  pango_layout_iter_free (iter);
-  pango_layout_set_text (pfont->layout, "", -1);
-  
-  schedule_flush ();
-
-  (*env)->ReleaseStringUTFChars (env, str, cstr);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawLine
-  (JNIEnv *env, jobject obj, jint x, jint y, jint x2, jint y2)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_line (g->drawable, g->gc, 
-		 x + g->x_offset, y + g->y_offset, 
-		 x2 + g->x_offset, y2 + g->y_offset);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_rectangle (g->drawable, g->gc, TRUE, 
-		      x + g->x_offset, y + g->y_offset, width, height);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawRect
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_rectangle (g->drawable, g->gc, FALSE, 
-		      x + g->x_offset, y + g->y_offset, width, height);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_copyArea
-  (JNIEnv *env, jobject obj, jint x, jint y, 
-   jint width, jint height, jint dx, jint dy)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_drawable ((GdkWindow *)g->drawable,
-		     g->gc,
-		     (GdkWindow *)g->drawable,
-		     x + g->x_offset, y + g->y_offset,
-		     x + g->x_offset + dx, y + g->y_offset + dy,
-		     width, height);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
-{
-  struct graphics *g = NULL;
-  GdkGCValues saved;
-  GtkWidget *widget = NULL;
-  union widget_union w;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  if (!g)
-    {
-      gdk_threads_leave ();
-      return;
-    }
-
-  if (GDK_IS_WINDOW (g->drawable))
-    {
-      w.widget = &widget;
-      gdk_window_get_user_data (GDK_WINDOW (g->drawable), w.void_widget);
-      if (widget == NULL || !GTK_IS_EVENT_BOX (widget))
-        gdk_window_clear_area ((GdkWindow *) g->drawable,
-                               x + g->x_offset, y + g->y_offset,
-                               width, height);
-    }
-  else
-    {
-      gdk_gc_get_values (g->gc, &saved);
-      gdk_gc_set_background (g->gc, &(saved.background));
-      gdk_draw_rectangle (g->drawable, g->gc, TRUE, 
-			  x + g->x_offset, y + g->y_offset, width, height);
-      gdk_gc_set_foreground (g->gc, &(saved.foreground));
-    }
-
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_setFunction
-  (JNIEnv *env, jobject obj, jint func)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_gc_set_function (g->gc, func);
-
-  gdk_threads_leave ();
-}
-
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor
-  (JNIEnv *env, jobject obj, jint red, jint green, jint blue)
-{
-  GdkColor color;
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  color.red = red << 8;
-  color.green = green << 8;
-  color.blue = blue << 8;
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-  
-  if (g->cm != NULL)
-    gdk_colormap_alloc_color (g->cm, &color, TRUE, TRUE);
-    
-  gdk_gc_set_foreground (g->gc, &color);
-  
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawArc
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, 
-   jint angle1, jint angle2)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_arc (g->drawable, g->gc, FALSE, 
-		x + g->x_offset, y + g->y_offset, 
-		width, height, angle1 << 6, angle2 << 6);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}  
-
-static GdkPoint *
-translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, 
-		  jint npoints, jint x_offset, jint y_offset)
-{
-  GdkPoint *points;
-  jint *x, *y;
-  int i;
-
-  /* allocate one more point than necessary, in case we need to tack
-     on an extra due to the semantics of Java polygons. */
-  points = g_malloc (sizeof (GdkPoint) * (npoints + 1));
-  
-  x = (*env)->GetIntArrayElements (env, xpoints, NULL);
-  y = (*env)->GetIntArrayElements (env, ypoints, NULL);
-
-  for (i = 0; i < npoints; i++)
-    {
-      points[i].x = x[i] + x_offset;
-      points[i].y = y[i] + y_offset;
-    }
-
-  (*env)->ReleaseIntArrayElements (env, xpoints, x, JNI_ABORT);
-  (*env)->ReleaseIntArrayElements (env, ypoints, y, JNI_ABORT);
-
-  return points;
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline
-  (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, 
-   jint npoints)
-{
-  struct graphics *g = NULL;
-  GdkPoint *points = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-  points = translate_points (env, xpoints, ypoints, npoints,
-			     g->x_offset, g->y_offset);
-
-  gdk_draw_lines (g->drawable, g->gc, points, npoints);
-  schedule_flush ();
-
-  g_free (points);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolygon
-  (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, 
-   jint npoints)
-{
-  struct graphics *g = NULL;
-  GdkPoint *points = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-  points = translate_points (env, xpoints, ypoints, npoints,
-			     g->x_offset, g->y_offset);
-
-  /* make sure the polygon is closed, per Java semantics.
-     if it's not, we close it. */
-  if (points[0].x != points[npoints-1].x || points[0].y != points[npoints-1].y)
-    points[npoints++] = points[0];
-
-  gdk_draw_lines (g->drawable, g->gc, points, npoints);
-  schedule_flush ();
-
-  g_free (points);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_fillPolygon
-  (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, 
-   jint npoints)
-{
-  struct graphics *g = NULL;
-  GdkPoint *points = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-  points = translate_points (env, xpoints, ypoints, npoints,
-			     g->x_offset, g->y_offset);
-  gdk_draw_polygon (g->drawable, g->gc, TRUE, points, npoints);
-  schedule_flush ();
-
-  g_free (points);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_fillArc
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, 
-   jint angle1, jint angle2)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_arc (g->drawable, g->gc, TRUE, 
-		x + g->x_offset, y + g->y_offset, 
-		width, height, angle1 << 6, angle2 << 6);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}  
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_drawOval
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_arc (g->drawable, g->gc, FALSE, 
-		x + g->x_offset, y + g->y_offset, 
-		width, height, 0, 23040);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}  
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_fillOval
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
-{
-  struct graphics *g = NULL;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  gdk_draw_arc (g->drawable, g->gc, TRUE, 
-		x + g->x_offset, y + g->y_offset, 
-		width, height, 0, 23040);
-  schedule_flush ();
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics_setClipRectangle
-  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
-{
-  struct graphics *g = NULL;
-  GdkRectangle rectangle;
-
-  gdk_threads_enter ();
-
-  g = (struct graphics *) NSA_GET_G_PTR (env, obj);
-
-  rectangle.x = x + g->x_offset;
-  rectangle.y = y + g->y_offset;
-  rectangle.width = width;
-  rectangle.height = height;
-
-  gdk_gc_set_clip_rectangle (g->gc, &rectangle);
-
-  gdk_threads_leave ();
-}
-
-static void
-realize_cb (GtkWidget *widget __attribute__ ((unused)), jobject jgraphics)
-{
-  (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(),
-                                       jgraphics,
-                                       initComponentGraphicsUnlockedID);
-
-  NSA_DEL_GLOBAL_G_REF (cp_gtk_gdk_env(), jgraphics);
-}
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
index b42f649a1..56c13b6c1 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
@@ -1,42 +1,41 @@
 /* gnu_java_awt_peer_gtk_GdkGraphics2d.c
    Copyright (C) 2003, 2005, 2006  Free Software Foundation, Inc.
 
-   This file is part of GNU Classpath.
+This file is part of GNU Classpath.
    
-   GNU Classpath is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
    
-   GNU Classpath is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
    
-   You should have received a copy of the GNU General Public License
-   along with GNU Classpath; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
    
-   Linking this library statically or dynamically with other modules is
-   making a combined work based on this library.  Thus, the terms and
-   conditions of the GNU General Public License cover the whole
-   combination.
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
    
-   As a special exception, the copyright holders of this library give you
-   permission to link this library with independent modules to produce an
-   executable, regardless of the license terms of these independent
-   modules, and to copy and distribute the resulting executable under
-   terms of your choice, provided that you also meet, for each linked
-   independent module, the terms and conditions of the license of that
-   module.  An independent module is a module which is not derived from
-   or based on this library.  If you modify this library, you may extend
-   this exception to your version of the library, but you are not
-   obligated to do so.  If you do not wish to do so, delete this
-   exception statement from your version. */
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #include "jcl.h"
-#include "gtkcairopeer.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkGraphics2D.h"
 #include <gdk/gdktypes.h>
@@ -53,37 +52,47 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-static jmethodID initComponentGraphics2DUnlockedID;
+struct state_table *cp_gtk_native_graphics2d_state_table;
 
-void
-cp_gtk_graphics2d_init_jni (void)
-{
-  jclass gdkgraphics2d;
-  JNIEnv *env = cp_gtk_gdk_env();
+/*
+ * AWT applications may call Graphics methods from threads other than
+ * the GDK main thread, so we must call XFlush after each batch of
+ * drawing operations, otherwise animations flicker.  Flushing after
+ * every graphics operation is excessive and negatively affects
+ * performance (PR 26486).  We set the maximum frequency to 50 times
+ * per second, or a minimum period of 20 milliseconds between calls to
+ * XFlush.  See gnu.classpath.examples.awt.AnimationApplet for an
+ * example applet that requires these XFlush calls.
+ */
 
-  gdkgraphics2d = (*env)->FindClass (env,
-				     "gnu/java/awt/peer/gtk/GdkGraphics2D");
-  if ((*env)->ExceptionOccurred(env))
-    return;
+static short flush_scheduled = 0;
 
-  initComponentGraphics2DUnlockedID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), gdkgraphics2d,
-                                                         "initComponentGraphics2DUnlocked",
-                                                         "()V");
-}
+static gboolean flush (gpointer data __attribute__((unused)))
+{
+  gdk_threads_enter ();
 
-static struct state_table *native_graphics2d_state_table;
+  XFlush (GDK_DISPLAY ());
+  flush_scheduled = 0;
 
-#define NSA_G2D_INIT(env, clazz) \
-  native_graphics2d_state_table = cp_gtk_init_state_table (env, clazz)
+  gdk_threads_leave ();
 
-#define NSA_GET_G2D_PTR(env, obj) \
-  cp_gtk_get_state (env, obj, native_graphics2d_state_table)
+  return FALSE;
+}
 
-#define NSA_SET_G2D_PTR(env, obj, ptr) \
-  cp_gtk_set_state (env, obj, native_graphics2d_state_table, (void *)ptr)
+/* The minimum time period between calls to XFlush, in
+   milliseconds. */
+#define MINIMUM_FLUSH_PERIOD 20
 
-#define NSA_DEL_G2D_PTR(env, obj) \
-  cp_gtk_remove_state_slot (env, obj, native_graphics2d_state_table)
+/* schedule_flush must be called with the GDK lock held. */
+static void
+schedule_flush ()
+{
+  if (!flush_scheduled)
+    {
+      g_timeout_add (MINIMUM_FLUSH_PERIOD, flush, NULL);
+      flush_scheduled = 1;
+    }
+}
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStaticState 
@@ -157,8 +166,6 @@ peer_is_disposed(JNIEnv *env, jobject obj)
   jclass cls;
   jobject peer;
 
-  return 0;
-
   if (fid == NULL)
     {
       cls = (*env)->GetObjectClass(env, obj);
@@ -170,12 +177,9 @@ peer_is_disposed(JNIEnv *env, jobject obj)
   if (peer == NULL || NSA_GET_PTR (env, peer) != NULL)
     return 0;
   else
-    {
-      return 1;
-    }
+    return 1;
 }
 
-
 static void 
 grab_current_drawable (GtkWidget *widget, GdkDrawable **draw, GdkWindow **win)
 {  
@@ -367,6 +371,8 @@ end_drawing_operation (JNIEnv *env, struct graphics2d * gr)
 	memcpy (gr->javabuf, gr->javabuf_copy, gr->width * gr->height * 4);
       (*env)->ReleasePrimitiveArrayCritical (env, gr->jarray, gr->javabuf, JNI_COMMIT);
     }
+
+  schedule_flush ();
 }
 
 
@@ -389,14 +395,6 @@ check_for_debug (struct graphics2d *gr)
   gr->debug = (gboolean)(getenv("DEBUGJ2D") != NULL);
 }
 
-static void
-realize_cb (GtkWidget *widget __attribute__ ((unused)), jobject peer)
-{
-  (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(),
-                                       peer,
-                                       initComponentGraphics2DUnlockedID);
-}
-
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_copyState
   (JNIEnv *env, jobject obj, jobject old)
@@ -553,7 +551,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
-  (JNIEnv *env, jobject self, jobject other, jint x, jint y)
+  (JNIEnv *env, jobject obj, jobject other, jint x, jint y)
 {
   struct graphics2d *src = NULL;
   struct graphics2d *dst = NULL;
@@ -567,15 +565,15 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
   cairo_operator_t tmp_op;
 
   gdk_threads_enter();
-  
-  if (peer_is_disposed(env, self))
+
+  if (peer_is_disposed(env, obj))
     {
       gdk_threads_leave();
       return;
     }
 
   src = (struct graphics2d *)NSA_GET_G2D_PTR (env, other);
-  dst = (struct graphics2d *)NSA_GET_G2D_PTR (env, self);
+  dst = (struct graphics2d *)NSA_GET_G2D_PTR (env, obj);
   g_assert (src != NULL);
   g_assert (dst != NULL);  
 
@@ -585,8 +583,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
 
   /* gdk_flush(); */
 
-  if (!GDK_IS_DRAWABLE (src->drawable) || 
-   !GDK_IS_DRAWABLE (dst->drawable))
+  if (!GDK_IS_DRAWABLE (src->drawable) ||
+      !GDK_IS_DRAWABLE (dst->drawable))
     {
       gdk_threads_leave ();
       return;
@@ -611,8 +609,6 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
   if (src->pattern)
     cairo_pattern_set_matrix (src->pattern, &matrix);
 
-  gdk_flush();
-
   end_drawing_operation(env, dst);
 
   if (src->debug) printf ("copied %d x %d pixels from offscreen drawable\n", width, height);
@@ -621,43 +617,6 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStateUnlocked
-  (JNIEnv *env, jobject obj, jobject peer)
-{
-  struct graphics2d *gr = NULL;
-  GtkWidget *widget = NULL;
-  void *ptr = NULL;
-
-  if (peer_is_disposed(env, obj))
-    return;
-
-  ptr = NSA_GET_PTR (env, peer);
-  g_assert (ptr != NULL);
-
-  gr = (struct graphics2d *) g_malloc (sizeof (struct graphics2d));
-  g_assert (gr != NULL);
-  memset (gr, 0, sizeof(struct graphics2d));
-
-  check_for_debug (gr);
-
-  widget = GTK_WIDGET (ptr);
-  g_assert (widget != NULL);
-
-  grab_current_drawable (widget, &(gr->drawable), &(gr->win));
-  g_assert (gr->drawable != NULL);
-
-  gr->width = widget->allocation.width;
-  gr->height = widget->allocation.height;
-
-  if (x_server_has_render_extension ())
-    init_graphics2d_as_renderable (gr);
-  else
-    init_graphics2d_as_pixbuf (gr);
-
-  NSA_SET_G2D_PTR (env, obj, gr);
-}
-
-JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
   (JNIEnv *env, jobject obj, jobject peer)
 {
@@ -669,7 +628,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkCo
 
   if (peer_is_disposed(env, obj))
     {
-      gdk_threads_leave ();
+      gdk_threads_leave();
       return;
     }
 
@@ -702,62 +661,58 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkCo
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_connectSignals
-  (JNIEnv *env, jobject obj, jobject peer)
-{
-  void *ptr;
-
-  gdk_threads_enter ();
-
-  ptr = NSA_GET_PTR (env, peer);
-
-  g_signal_connect_after (G_OBJECT (ptr), "realize",
-                          G_CALLBACK (realize_cb), obj);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose
   (JNIEnv *env, jobject obj)
 {
   struct graphics2d *gr = NULL;
 
-  gdk_threads_enter();
-
   gr = (struct graphics2d *) NSA_DEL_G2D_PTR (env, obj);
 
-  if (gr == NULL) 
+  /* dispose has been called more than once */
+  if (gr == NULL)
+    return;
+
+  gdk_threads_enter();
+
+  if (peer_is_disposed(env, obj))
     {
       gdk_threads_leave();
-      return; /* dispose has been called more than once */
+      return;
     }
 
   if (gr->surface)
     cairo_surface_destroy (gr->surface);
+  gr->surface = NULL;
 
   cairo_destroy (gr->cr);
+  gr->cr = NULL;
 
   if (gr->drawbuf)
     g_object_unref (gr->drawbuf); 
+  gr->drawbuf = NULL;
 
   if (gr->drawable)
     g_object_unref (gr->drawable);
+  gr->drawable = NULL;
 
   if (gr->pattern)
     cairo_pattern_destroy (gr->pattern);
+  gr->pattern = NULL;
 
   if (gr->pattern_surface)
     cairo_surface_destroy (gr->pattern_surface);
+  gr->pattern_surface = NULL;
 
   if (gr->pattern_pixels)
     g_free (gr->pattern_pixels);
+  gr->pattern_pixels = NULL;
 
   if (gr->mode == MODE_JAVA_ARRAY)
     {
       (*env)->DeleteGlobalRef (env, gr->jarray);
       if (gr->javabuf_copy)
         g_free (gr->javabuf_copy);
+      gr->javabuf_copy = NULL;
     }
 
   if (gr->debug) printf ("disposed of graphics2d\n");
@@ -768,27 +723,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient 
-  (JNIEnv *env, jobject obj, 
-   jdouble x1, jdouble y1, 
-   jdouble x2, jdouble y2,
-   jint r1, jint g1, jint b1, jint a1,
-   jint r2, jint g2, jint b2, jint a2,
-   jboolean cyclic)
-{
-  gdk_threads_enter();
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradientUnlocked
-    (env, obj,
-     x1, y1, x2, y2,
-     r1, g1, b1, a1,
-     r2, g2, b2, a2,
-     cyclic);
-
-  gdk_threads_leave();
-}
-  
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradientUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient
   (JNIEnv *env, jobject obj, 
    jdouble x1, jdouble y1, 
    jdouble x2, jdouble y2,
@@ -804,11 +739,16 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradientUnlocked
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   if (gr->debug)
-    printf ("setGradientUnlocked (%f,%f) -> (%f,%f); (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",
+    printf ("setGradient (%f,%f) -> (%f,%f); (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",
 	    x1, y1,
 	    x2, y2,
 	    r1, g1, b1, a1,
@@ -907,35 +847,30 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradientUnlocked
   gr->pattern = cairo_pattern_create_for_surface(surf);
 
   cairo_set_source (gr->cr, gr->pattern);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels 
-  (JNIEnv *env, jobject obj, jintArray jarr, jint w, jint h, jint stride)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixelsUnlocked
-    (env, obj, jarr, w, h, stride);
 
   gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixelsUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels
   (JNIEnv *env, jobject obj, jintArray jarr, jint w, jint h, jint stride)
 {
   struct graphics2d *gr = NULL;
   jint *jpixels = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
 
   if (gr->debug)
-    printf ("setTexturePixelsUnlocked (%d pixels, %dx%d, stride: %d)\n",
+    printf ("setTexturePixels (%d pixels, %dx%d, stride: %d)\n",
 	    (*env)->GetArrayLength (env, jarr), w, h, stride);
 
   if (gr->pattern)
@@ -967,6 +902,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixelsUnlocked
   g_assert (gr->pattern != NULL);
   cairo_pattern_set_extend (gr->pattern, CAIRO_EXTEND_REPEAT);
   cairo_set_source (gr->cr, gr->pattern);
+
+  gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
@@ -1079,34 +1016,22 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRestore
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix 
-   (JNIEnv *env, jobject obj, jdoubleArray java_matrix)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrixUnlocked
-    (env, obj, java_matrix);
-
-  gdk_threads_leave();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrixUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix
    (JNIEnv *env, jobject obj, jdoubleArray java_matrix)
 {
   struct graphics2d *gr = NULL;
   jdouble *native_matrix = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
 
-  /* cairoSetMatrix was called before this graphics object's component
-     was realized. */
-  if (gr == NULL)
-    return;
-
   native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);  
   g_assert (native_matrix != NULL);
   g_assert ((*env)->GetArrayLength (env, java_matrix) == 6);
@@ -1130,6 +1055,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrixUnlocked
 
   (*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0);
   update_pattern_transform (gr);
+
+  gdk_threads_leave();
 }
 
 static void
@@ -1142,37 +1069,43 @@ install_font_peer(cairo_t *cr,
 
   g_assert(cr != NULL);
   g_assert(pfont != NULL);
-  
+
   if (pfont->graphics_resource == NULL)
     {
       face = pango_ft2_font_get_face (pfont->font);
       g_assert (face != NULL);
-      
+
       ft = cairo_ft_font_face_create_for_ft_face (face, 0);
       g_assert (ft != NULL);
-      
-      if (debug) printf ("install_font_peer made new cairo font for '%s' at %f\n", 
+
+      if (debug) printf ("install_font_peer made new cairo font for '%s' at %f\n",
 			 face->family_name,
-			 (pango_font_description_get_size (pfont->desc) / 
+			 (pango_font_description_get_size (pfont->desc) /
 			  (double)PANGO_SCALE));
-    
-      cairo_set_font_face (cr, ft); 
+
+      cairo_set_font_face (cr, ft);
       cairo_font_face_destroy (ft);
-      cairo_set_font_size (cr, 
-			(pango_font_description_get_size (pfont->desc) / 
-			 (double)PANGO_SCALE));
+      cairo_set_font_size (cr,
+                           (pango_font_description_get_size (pfont->desc) /
+                            (double)PANGO_SCALE));
       ft = cairo_get_font_face (cr);
       pfont->graphics_resource = ft;
     }
   else
     {
-      if (debug) printf ("install_font_peer reused existing font resource\n");
+      if (debug) printf ("install_font_peer reused existing font resource"
+                         " for '%s' at %f\n",
+			 pango_font_description_get_family(pfont->desc),
+			 (pango_font_description_get_size (pfont->desc) /
+			  (double)PANGO_SCALE));
       ft = (cairo_font_face_t *) pfont->graphics_resource;
-      cairo_set_font_face (cr, ft);       
+      cairo_set_font_face (cr, ft);
+      cairo_set_font_size (cr,
+                           (pango_font_description_get_size (pfont->desc) /
+                            (double)PANGO_SCALE));
     }
 }
 
-
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_releasePeerGraphicsResource
    (JNIEnv *env, jclass clazz __attribute__ ((unused)), jobject java_font)
@@ -1253,7 +1186,7 @@ paint_glyph_run(JNIEnv *env,
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGlyphVector
-   (JNIEnv *env, jobject self, 
+   (JNIEnv *env, jobject obj, 
     jobject font,
     jfloat x, jfloat y, jint n,
     jintArray java_codes,
@@ -1269,17 +1202,17 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGlyphVector
 
   gdk_threads_enter ();
 
-  g_assert (self != NULL);
-  g_assert (java_codes != NULL);
-  g_assert (java_positions != NULL);
-
-  if (peer_is_disposed(env, self))
+  if (peer_is_disposed(env, obj))
     {
       gdk_threads_leave();
       return;
     }
 
-  gr = (struct graphics2d *)NSA_GET_G2D_PTR (env, self);
+  g_assert (obj != NULL);
+  g_assert (java_codes != NULL);
+  g_assert (java_positions != NULL);
+
+  gr = (struct graphics2d *)NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
 
   pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
@@ -1314,7 +1247,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGlyphVector
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGdkTextLayout
-   (JNIEnv *env, jobject self, jobject java_layout, jfloat x, jfloat y)
+   (JNIEnv *env, jobject obj, jobject java_layout, jfloat x, jfloat y)
 {
   /* 
    * FIXME: Some day we expect either cairo or pango will know how to make
@@ -1328,12 +1261,10 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGdkTextLayout
   cairo_glyph_t *glyphs = NULL;
   gint n_glyphs = 0;
 
-  gdk_threads_enter ();
-
-  g_assert (self != NULL);
+  g_assert (obj != NULL);
   g_assert (java_layout != NULL);
 
-  gr = (struct graphics2d *)NSA_GET_G2D_PTR (env, self);
+  gr = (struct graphics2d *)NSA_GET_G2D_PTR (env, obj);
   tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, java_layout);
 
   g_assert (gr != NULL);
@@ -1342,7 +1273,9 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGdkTextLayout
 
   if (gr->debug) printf ("painting pango layout\n");
 
-  if (peer_is_disposed(env, self))
+  gdk_threads_enter ();
+
+  if (peer_is_disposed(env, obj))
     {
       gdk_threads_leave();
       return;
@@ -1443,25 +1376,18 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetOperator
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColor 
-   (JNIEnv *env, jobject obj, jdouble r, jdouble g, jdouble b, jdouble a)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColorUnlocked
-    (env, obj, r, g, b, a);
-
-  gdk_threads_leave();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColorUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColor
    (JNIEnv *env, jobject obj, jdouble r, jdouble g, jdouble b, jdouble a)
 {
   struct graphics2d *gr = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
@@ -1478,6 +1404,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColorUnlocked
     cairo_set_source_rgba (gr->cr, b, g, r, a);
   else
     cairo_set_source_rgba (gr->cr, r, g, b, a);
+
+  gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
@@ -1505,58 +1433,46 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFillRule
     case java_awt_geom_path_iterator_WIND_EVEN_ODD:
       cairo_set_fill_rule (gr->cr, CAIRO_FILL_RULE_EVEN_ODD);
       break;
-    }  
-
-  gdk_threads_leave();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidth 
-   (JNIEnv *env, jobject obj, jdouble width)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidthUnlocked
-    (env, obj, width);
+    }
 
   gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidthUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidth
    (JNIEnv *env, jobject obj, jdouble width)
 {
   struct graphics2d *gr = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
   if (gr->debug) printf ("cairo_set_line_width %f\n", width);
   cairo_set_line_width (gr->cr, width);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCap 
-   (JNIEnv *env, jobject obj, jint cap)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCapUnlocked
-    (env, obj, cap);
 
   gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCapUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCap
    (JNIEnv *env, jobject obj, jint cap)
 {
   struct graphics2d *gr = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
@@ -1575,28 +1491,23 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCapUnlocked
       cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_SQUARE);
       break;
     }
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin
-   (JNIEnv *env, jobject obj, jint join)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoinUnlocked
-    (env, obj, join);
 
   gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoinUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin
    (JNIEnv *env, jobject obj, jint join)
 {
   struct graphics2d *gr = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
@@ -1615,29 +1526,24 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoinUnlocked
       cairo_set_line_join (gr->cr, CAIRO_LINE_JOIN_BEVEL);
       break;
     }
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDash
-   (JNIEnv *env, jobject obj, jdoubleArray dashes, jint ndash, jdouble offset)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDashUnlocked
-    (env, obj, dashes, ndash, offset);
 
   gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDashUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDash
    (JNIEnv *env, jobject obj, jdoubleArray dashes, jint ndash, jdouble offset)
 {
   struct graphics2d *gr = NULL;
   jdouble *dasharr = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
@@ -1646,33 +1552,30 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDashUnlocked
   g_assert (dasharr != NULL);
   cairo_set_dash (gr->cr, dasharr, ndash, offset);
   (*env)->ReleaseDoubleArrayElements (env, dashes, dasharr, 0);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimit 
-   (JNIEnv *env, jobject obj, jdouble miter)
-{
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimitUnlocked
-    (env, obj, miter);
 
   gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimitUnlocked
+Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimit
    (JNIEnv *env, jobject obj, jdouble miter)
 {
   struct graphics2d *gr = NULL;
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
   if (gr->debug) printf ("cairo_set_miter_limit %f\n", miter);
   cairo_set_miter_limit (gr->cr, miter);
+
+  gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL
@@ -1681,6 +1584,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoNewPath
 {
   struct graphics2d *gr = NULL;
 
+  gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
+
   gdk_threads_enter();
 
   if (peer_is_disposed(env, obj))
@@ -1689,14 +1594,6 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoNewPath
       return;
     }
 
-  gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
-
-  if (gr == NULL)
-    {
-      gdk_threads_leave ();
-      return;
-    }
-
   if (gr->debug) printf ("cairo_new_path\n");
   cairo_new_path (gr->cr);
 
@@ -1845,6 +1742,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRectangle
 {
   struct graphics2d *gr = NULL;
 
+  gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
+
   gdk_threads_enter();
 
   if (peer_is_disposed(env, obj))
@@ -1853,14 +1752,6 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRectangle
       return;
     }
 
-  gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
-
-  if (gr == NULL)
-    {
-      gdk_threads_leave ();
-      return;
-    }
-
   if (gr->debug)
     printf ("cairo_rectangle (%f, %f) (%f, %f)\n", x, y, width, height);
   cairo_rectangle (gr->cr, x, y, width, height);
@@ -1944,6 +1835,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip
 {
   struct graphics2d *gr = NULL;
 
+  gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
+
   gdk_threads_enter();
 
   if (peer_is_disposed(env, obj))
@@ -1952,14 +1845,6 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip
       return;
     }
 
-  gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
-
-  if (gr == NULL)
-    {
-      gdk_threads_leave ();
-      return;
-    }
-
   if (gr->debug) printf ("cairo_clip\n");
   begin_drawing_operation (env, gr);
   cairo_reset_clip (gr->cr);
@@ -1973,22 +1858,15 @@ JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilter
    (JNIEnv *env, jobject obj, jint filter)
 {
-  gdk_threads_enter();
-
-  Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilterUnlocked
-    (env, obj, filter);
-
-  gdk_threads_leave();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilterUnlocked
-   (JNIEnv *env, jobject obj, jint filter)
-{
   struct graphics2d *gr = NULL;   
 
+  gdk_threads_enter();
+
   if (peer_is_disposed(env, obj))
-    return;
+    {
+      gdk_threads_leave();
+      return;
+    }
 
   gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
   g_assert (gr != NULL);
@@ -2015,4 +1893,6 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilterUnlocked
       cairo_pattern_set_filter (gr->pattern, CAIRO_FILTER_BEST);
       break;
     }
+
+  gdk_threads_leave();
 }
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c
index f44361972..ef9ac1207 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c
@@ -56,17 +56,3 @@ Java_gnu_java_awt_peer_gtk_GtkCanvasPeer_create
 
   gdk_threads_leave ();
 }
-
-JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkCanvasPeer_realize (JNIEnv *env, jobject obj)
-{
-  void *ptr;
-
-  gdk_threads_enter ();
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gtk_widget_realize (GTK_WIDGET (ptr));
-
-  gdk_threads_leave ();
-}
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index b0d4ab9b0..4cd80a73f 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -204,6 +204,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursorUnlocked
 {
   void *ptr;
   GtkWidget *widget;
+  GdkWindow *win;
   GdkCursorType gdk_cursor_type;
   GdkCursor *gdk_cursor;
 
@@ -255,16 +256,20 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursorUnlocked
     }
       
   widget = get_widget(GTK_WIDGET(ptr));
-
+  
+  win = widget->window;
+  if ((widget->window) == NULL)
+    win = GTK_WIDGET(ptr)->window;
+    
   if (image == NULL)
     gdk_cursor = gdk_cursor_new (gdk_cursor_type);
   else
     gdk_cursor
-      = gdk_cursor_new_from_pixbuf (gdk_drawable_get_display (widget->window),
+      = gdk_cursor_new_from_pixbuf (gdk_drawable_get_display (win),
 				    cp_gtk_image_get_pixbuf (env, image),
 				    x, y);
 
-  gdk_window_set_cursor (widget->window, gdk_cursor);
+  gdk_window_set_cursor (win, gdk_cursor);
   gdk_cursor_unref (gdk_cursor);
 
   /* Make sure the cursor is replaced on screen. */
@@ -749,6 +754,20 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground
 }
 
 JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkComponentPeer_realize (JNIEnv *env, jobject obj)
+{
+  void *ptr;
+
+  gdk_threads_enter ();
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gtk_widget_realize (GTK_WIDGET (ptr));
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setVisibleNative
   (JNIEnv *env, jobject obj, jboolean visible)
 {
@@ -793,30 +812,6 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled
 }
 
 JNIEXPORT jboolean JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isRealized
-  (JNIEnv *env, jobject obj)
-{
-  void *ptr;
-  jboolean ret_val;
-
-  gdk_threads_enter ();
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  if (ptr == NULL)
-    {
-      gdk_threads_leave ();
-      return FALSE;
-    }
-
-  ret_val = GTK_WIDGET_REALIZED (get_widget(GTK_WIDGET (ptr)));
-
-  gdk_threads_leave ();
-
-  return ret_val;
-}
-
-JNIEXPORT jboolean JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab
   (JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
 {
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
index b40e86289..dad6a1182 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
@@ -37,8 +37,10 @@ exception statement from your version. */
 
 #include "jcl.h"
 #include "gtkpeer.h"
+#include <cairo-xlib.h>
+#include <gdk/gdkx.h>
+
 #include "gnu_java_awt_peer_gtk_GtkImage.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 /* The constant fields in java.awt.Image */   
 #define SCALE_DEFAULT      1
@@ -324,7 +326,7 @@ Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaled
    jint x, jint y, jint width, jint height, jboolean composite)
 {
   GdkPixbuf* dst;
-  struct graphics *g;
+  struct graphics2d *g;
   guint32 bgColor;
 
   gdk_threads_enter ();
@@ -338,7 +340,7 @@ Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaled
   bgColor = ((bg_red & 0xFF) << 16) |
     ((bg_green & 0xFF) << 8) | (bg_blue & 0xFF);
     
-  g = (struct graphics *) NSA_GET_G_PTR (env, gc_obj);
+  g = (struct graphics2d *) NSA_GET_G2D_PTR (env, gc_obj);
   
   if (!g || !GDK_IS_DRAWABLE (g->drawable))
     {
@@ -365,24 +367,16 @@ Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaled
 				      width, height,
 				      GDK_INTERP_BILINEAR);
 
-      gdk_draw_pixbuf (g->drawable,
-		       g->gc,
-		       dst,
-		       0, 0,
-		       x + g->x_offset, y + g->y_offset, 
-		       width, height,
-		       GDK_RGB_DITHER_NORMAL, 0, 0);
+      gdk_cairo_set_source_pixbuf (g->cr, dst, (double) x, (double) y);
       gdk_pixbuf_unref (dst);
 
     } else {
       /* Get a pixmap */
       GdkPixmap* pixmap = (GdkPixmap *)getData (env, obj);
-      gdk_draw_drawable (g->drawable,
-			 g->gc,
-			 pixmap,
-			 0, 0, /* src x,y */
-			 x + g->x_offset, y + g->y_offset, 
-			 width, height);
+      cairo_xlib_surface_set_drawable (g->surface,
+                                       GDK_PIXMAP_XID(pixmap),
+                                       width,
+                                       height);
     }
     
   gdk_threads_leave ();
@@ -408,7 +402,7 @@ Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaledFlipped
 {
   GdkPixbuf *pixbuf;
   GdkPixbuf *tmp, *dst;
-  struct graphics *g;
+  struct graphics2d *g;
   guint32 bgColor;
 
   gdk_threads_enter ();
@@ -423,7 +417,7 @@ Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaledFlipped
   bgColor = ((bg_red & 0xFF) << 16) |
     ((bg_green & 0xFF) << 8) | (bg_blue & 0xFF);
     
-  g = (struct graphics *) NSA_GET_G_PTR (env, gc_obj);
+  g = (struct graphics2d *) NSA_GET_G2D_PTR (env, gc_obj);
   
   if (!g || !GDK_IS_DRAWABLE (g->drawable))
     {
@@ -492,14 +486,8 @@ Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaledFlipped
 				  GDK_INTERP_BILINEAR);
   gdk_pixbuf_unref (tmp);
     
-  gdk_draw_pixbuf (g->drawable,
-		   g->gc,
-		   dst,
-		   0, 0,
-		   dstx + g->x_offset, dsty + g->y_offset, 
-		   dstwidth, dstheight,
-		   GDK_RGB_DITHER_NORMAL, 0, 0);
-  
+  gdk_cairo_set_source_pixbuf (g->cr, dst, (double) dstx,
+                               (double) dsty);
   gdk_pixbuf_unref (dst);
 
   gdk_threads_leave ();
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
index b14330e5f..c966f6331 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
@@ -185,10 +185,6 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env,
   old_glog_func = g_log_set_default_handler (&glog_func, NULL);
 #endif
 
-#if GTK_CAIRO
-  cp_gtk_graphics2d_init_jni ();
-#endif
-  cp_gtk_graphics_init_jni ();
   cp_gtk_button_init_jni ();
   cp_gtk_checkbox_init_jni ();
   cp_gtk_choice_init_jni ();
diff --git a/native/jni/gtk-peer/gtkcairopeer.h b/native/jni/gtk-peer/gtkcairopeer.h
deleted file mode 100644
index dee843c8a..000000000
--- a/native/jni/gtk-peer/gtkcairopeer.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef __GTKCAIROPEER_H__
-#define __GTKCAIROPEER_H__
-
-/* gtkcairopeer.h -- Some global variables and #defines
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-#include "gtkpeer.h"
-#include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-/* 
-   A graphics2d struct is both simpler and uglier than a graphics
-   struct. 
-
-   Most of the graphics2d drawing state is held in the referenced cairo_t
-   and corresponding cairo_surface_t, so we can ignore it.
-
-   In addition to the cairo_t, we need to hold an extra reference to the
-   underlying GdkDrawable so its refcount matches the lifecycle of the java
-   Graphics object which is peering with us; also a reference to a byte
-   buffer and cairo_surface_t which contain the pattern you're drawing from
-   (if it exists).
-
-   Finally, it is possible that we are using a non-RENDER capable X server,
-   therefore we will be drawing to an cairo_surface_t which is actually a
-   pixbuf. When this is the case, the pointer to a GdkPixbuf will be
-   non-NULL and any drawing operation needs to be bracketed by pixbuf
-   load/save operations. If the GdkPixbuf pointer is NULL, we will treat
-   the cairo_surface_t as RENDER-capable.
- */
-
-struct graphics2d
-{
-  cairo_t *cr;
-  cairo_surface_t *surface;
-  GdkDrawable *drawable;
-  GdkWindow *win;
-  GdkPixbuf *drawbuf;
-  char *pattern_pixels;
-  cairo_surface_t *pattern_surface;
-  cairo_pattern_t *pattern;
-  gboolean debug;
-  enum 
-    { 
-      MODE_DRAWABLE_WITH_RENDER,
-      MODE_DRAWABLE_NO_RENDER,
-      MODE_JAVA_ARRAY
-    } 
-  mode;
-
-  /* Support for MODE_JAVA_ARRAY */
-  jintArray jarray;
-  jint width, height;
-  jint *javabuf;
-  jint *javabuf_copy;
-  jboolean isCopy;
-};
-
-#endif /* __GTKCAIROPEER_H */
diff --git a/native/jni/gtk-peer/gtkpeer.h b/native/jni/gtk-peer/gtkpeer.h
index 9a1590b81..6ae7b06ae 100644
--- a/native/jni/gtk-peer/gtkpeer.h
+++ b/native/jni/gtk-peer/gtkpeer.h
@@ -36,12 +36,14 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
+#include <cairo.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <config.h>
 #include "native_state.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <jni.h>
 
@@ -54,6 +56,7 @@ exception statement from your version. */
 
 extern struct state_table *cp_gtk_native_state_table;
 extern struct state_table *cp_gtk_native_global_ref_table;
+extern struct state_table *cp_gtk_native_graphics2d_state_table;
 
 #define NSA_INIT(env, clazz) \
    do {cp_gtk_native_state_table = cp_gtk_init_state_table (env, clazz); \
@@ -83,32 +86,66 @@ extern struct state_table *cp_gtk_native_global_ref_table;
     (*env)->DeleteGlobalRef (env, *globRefPtr); \
     free (globRefPtr);} while (0)
 
-extern struct state_table *cp_gtk_native_graphics_state_table;
+#define NSA_G2D_INIT(env, clazz) \
+  cp_gtk_native_graphics2d_state_table = cp_gtk_init_state_table (env, clazz)
 
-#define NSA_G_INIT(env, clazz) \
-  cp_gtk_native_graphics_state_table = cp_gtk_init_state_table (env, clazz)
+#define NSA_GET_G2D_PTR(env, obj) \
+  cp_gtk_get_state (env, obj, cp_gtk_native_graphics2d_state_table)
 
-#define NSA_GET_G_PTR(env, obj) \
-  cp_gtk_get_state (env, obj, cp_gtk_native_graphics_state_table)
+#define NSA_SET_G2D_PTR(env, obj, ptr) \
+  cp_gtk_set_state (env, obj, cp_gtk_native_graphics2d_state_table, (void *)ptr)
 
-#define NSA_SET_G_PTR(env, obj, ptr) \
-  cp_gtk_set_state (env, obj, cp_gtk_native_graphics_state_table, (void *)ptr)
-
-#define NSA_DEL_G_PTR(env, obj) \
-  cp_gtk_remove_state_slot (env, obj, cp_gtk_native_graphics_state_table)
+#define NSA_DEL_G2D_PTR(env, obj) \
+  cp_gtk_remove_state_slot (env, obj, cp_gtk_native_graphics2d_state_table)
 
 #define SWAPU32(w)							\
   (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24))
 
-struct graphics
+/* 
+   A graphics2d struct is both simpler and uglier than a graphics
+   struct. 
+
+   Most of the graphics2d drawing state is held in the referenced cairo_t
+   and corresponding cairo_surface_t, so we can ignore it.
+
+   In addition to the cairo_t, we need to hold an extra reference to the
+   underlying GdkDrawable so its refcount matches the lifecycle of the java
+   Graphics object which is peering with us; also a reference to a byte
+   buffer and cairo_surface_t which contain the pattern you're drawing from
+   (if it exists).
+
+   Finally, it is possible that we are using a non-RENDER capable X server,
+   therefore we will be drawing to an cairo_surface_t which is actually a
+   pixbuf. When this is the case, the pointer to a GdkPixbuf will be
+   non-NULL and any drawing operation needs to be bracketed by pixbuf
+   load/save operations. If the GdkPixbuf pointer is NULL, we will treat
+   the cairo_surface_t as RENDER-capable.
+ */
+struct graphics2d
 {
+  cairo_t *cr;
+  cairo_surface_t *surface;
   GdkDrawable *drawable;
-  GdkGC *gc;
-  GdkColormap *cm;
-  PangoFontDescription *pango_font;
-  PangoContext *pango_context;
-  PangoLayout *pango_layout;
-  jint x_offset, y_offset;
+  GdkWindow *win;
+  GdkPixbuf *drawbuf;
+  char *pattern_pixels;
+  cairo_surface_t *pattern_surface;
+  cairo_pattern_t *pattern;
+  gboolean debug;
+  enum 
+    { 
+      MODE_DRAWABLE_WITH_RENDER,
+      MODE_DRAWABLE_NO_RENDER,
+      MODE_JAVA_ARRAY
+    } 
+  mode;
+
+  /* Support for MODE_JAVA_ARRAY */
+  jintArray jarray;
+  jint width, height;
+  jint *javabuf;
+  jint *javabuf_copy;
+  jboolean isCopy;
 };
 
 /* New-style event masks. */
@@ -196,10 +233,6 @@ GdkPixmap *cp_gtk_image_get_pixmap (JNIEnv *env, jobject obj);
 jboolean cp_gtk_image_is_offscreen (JNIEnv *env, jobject obj);
 
 /* JNI initialization functions */
-#if GTK_CAIRO
-void cp_gtk_graphics2d_init_jni (void);
-#endif
-void cp_gtk_graphics_init_jni (void);
 void cp_gtk_button_init_jni (void);
 void cp_gtk_checkbox_init_jni (void);
 void cp_gtk_choice_init_jni (void);
diff --git a/native/jni/java-net/Makefile.am b/native/jni/java-net/Makefile.am
index e48173a16..26bb64f73 100644
--- a/native/jni/java-net/Makefile.am
+++ b/native/jni/java-net/Makefile.am
@@ -12,11 +12,12 @@ libjavanet_la_SOURCES = javanet.c \
 			javanet.h \
 			java_net_VMInetAddress.c \
 			java_net_VMNetworkInterface.c \
+			java_net_VMURLConnection.c \
 			gnu_java_net_VMPlainDatagramSocketImpl.c \
                         gnu_java_net_VMPlainSocketImpl.c \
 			$(local_sources)
 
-libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
+libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo $(LIBMAGIC)
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
diff --git a/native/jni/java-net/java_net_VMURLConnection.c b/native/jni/java-net/java_net_VMURLConnection.c
new file mode 100644
index 000000000..52fae0ccb
--- /dev/null
+++ b/native/jni/java-net/java_net_VMURLConnection.c
@@ -0,0 +1,102 @@
+/* VMURLConnection.c - native bits for URLConnection
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include <config.h>
+
+#include <java_net_VMURLConnection.h>
+
+#ifdef HAVE_MAGIC_H
+
+#include <magic.h>
+
+static magic_t cookie;
+
+#endif /* HAVE_MAGIC_H */
+
+void
+Java_java_net_VMURLConnection_init (JNIEnv *env __attribute__ ((__unused__)),
+				    jclass klass __attribute__ ((__unused__)))
+{
+#ifdef HAVE_MAGIC_H
+  cookie = magic_open (MAGIC_MIME);
+  if (cookie == (magic_t) NULL)
+    return;
+  if (magic_load (cookie, NULL) == -1)
+    {
+      magic_close (cookie);
+      cookie = (magic_t) NULL;
+    }
+#endif /* HAVE_MAGIC_H */
+}
+
+#ifdef HAVE_MAGIC_H
+jstring
+Java_java_net_VMURLConnection_guessContentTypeFromBuffer (JNIEnv *env,
+							  jclass klass
+							  __attribute__ ((__unused__)),
+							  jbyteArray bytes,
+							  jint valid)
+{
+  jbyte *elements;
+  const char *result;
+
+  if (cookie == (magic_t) NULL)
+    return NULL;
+
+  elements = (*env)->GetByteArrayElements (env, bytes, NULL);
+  result = magic_buffer (cookie, elements, valid);
+
+  /* The mode we use doesn't matter, since we don't change the array. */
+  (*env)->ReleaseByteArrayElements (env, bytes, elements, JNI_ABORT);
+
+  if (result == NULL)
+    return NULL;
+  return (*env)->NewStringUTF (env, result);
+#else
+jstring
+Java_java_net_VMURLConnection_guessContentTypeFromBuffer (JNIEnv *env
+							  __attribute__ ((__unused__)),
+							  jclass klass
+							  __attribute__ ((__unused__)),
+							  jbyteArray bytes
+							  __attribute__ ((__unused__)),
+							  jint valid
+							  __attribute__ ((__unused__)))
+{
+  return NULL;
+#endif /* HAVE_MAGIC_H */
+}
diff --git a/native/jni/qt-peer/eventmethods.h b/native/jni/qt-peer/eventmethods.h
index ea5d45a5c..ae56da8e7 100644
--- a/native/jni/qt-peer/eventmethods.h
+++ b/native/jni/qt-peer/eventmethods.h
@@ -1,5 +1,5 @@
 /* eventmethods.cpp --
-   Copyright (C)  2005  Free Software Foundation, Inc.
+   Copyright (C)  2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -62,7 +62,7 @@ private:
     env->DeleteGlobalRef(componentCls);
   }
 
-  void callVoidMethod(char *methodName)
+  void callVoidMethod(const char *methodName)
   {
     JNIEnv *env;
     vm->GetEnv((void **)&env, JNI_VERSION_1_1);
@@ -72,7 +72,7 @@ private:
     env->CallVoidMethod( target, fireEventID );
   }
 
-  void callMouseMethod(char *methodName, 
+  void callMouseMethod(const char *methodName,
 		       int modifiers, int x, int y, int clickCount)
   {
     JNIEnv *env;