CairoGraphics2D.java: Always loadLibrary gtk-peer.

        * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Always loadLibrary
        gtk-peer.
        * gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise.
        * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise.
        * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: Likewise.
        * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
        * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Likewise.
        * gnu/java/awt/peer/gtk/*.class: Rebuilt.

From-SVN: r139181

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 010aad3ebb07944688d4719fd95fa444f5b7fc3a..c07666c6c79db7e33bb4c5d2ac882b7dfb3e35ff 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,14 @@
+2008-08-17  Mark Wielaard  <mark@klomp.org>
+
+       * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Always loadLibrary
+       gtk-peer.
+       * gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise.
+       * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise.
+       * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: Likewise.
+       * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
+       * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Likewise.
+       * gnu/java/awt/peer/gtk/*.class: Rebuilt.
+
 2008-06-28  Matthias Klose  <doko@ubuntu.com>
 
        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
@@ -15,7 +26,7 @@
        * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
        (compile): Reverse isAssignableFrom test.
        * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class:
-        Rebuilt.
+       Rebuilt.
 
 2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
 

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java b/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
index fcd3f6acd92bb3d159351bcff81a150ec69bd1f2..bc8c91a2b035b0460c72db5ae15b379093599ea0 100644 (file)
--- a/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
@@ -122,7 +122,7 @@ public abstract class CairoGraphics2D extends Graphics2D
 {
   static 
   {
-    if (Configuration.INIT_LOAD_LIBRARY)
+    if (true) // GCJ LOCAL
       {
         System.loadLibrary("gtkpeer");
       }
@@ -2171,4 +2171,4 @@ public abstract class CairoGraphics2D extends Graphics2D
     
     return new Rectangle2D.Double(minX, minY, (maxX - minX), (maxY - minY));
   }
-}
\ No newline at end of file
+}

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
index 403671cc63e15f171a437586422301deeb98df00..28fb84119e4d2ff8762ceb519750bf99a0acd69b 100644 (file)
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
@@ -167,7 +167,7 @@ public class GdkFontPeer extends ClasspathFontPeer
 
   static 
   {
-    if (Configuration.INIT_LOAD_LIBRARY)
+    if (true) // GCJ LOCAL
       {
         System.loadLibrary("gtkpeer");
       }

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
index 980866c4b67ccebae4f938485f2e0c24218ab582..dd6299492a41b7f6e51983ce9f8d01815b3b578e 100644 (file)
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
@@ -73,7 +73,7 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment
 
   static
   {
-    if (Configuration.INIT_LOAD_LIBRARY)
+    if (true) // GCJ LOCAL
       {
         System.loadLibrary("gtkpeer");
       }

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
index dbf4a2018c1805d2bc81e332af593914b72e32af..9b026953d764f8d4dbbe2dc508f636e6197b1a1e 100644 (file)
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
@@ -75,7 +75,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder
 {
   static 
   {
-    if (Configuration.INIT_LOAD_LIBRARY)
+    if (true) // GCJ LOCAL
       {
         System.loadLibrary("gtkpeer");
       }

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
index 9ce0b96dac3c3bc6df98c6cdaaa38f2bd12a132b..58b5834cb73aefb99b40a335997169eb49d187db 100644 (file)
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
@@ -99,7 +99,7 @@ class GdkScreenGraphicsDevice extends GraphicsDevice
 
   static
   {
-    if (Configuration.INIT_LOAD_LIBRARY)
+    if (true) // GCJ LOCAL
       {
         System.loadLibrary("gtkpeer");
       }

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
index 486304ef010196911afbb2f092e53957379e6d35..3b114468f4c64fa34b397bc8a1c5c86fae4b6624 100644 (file)
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -172,7 +172,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
 
   static
   {
-    if (Configuration.INIT_LOAD_LIBRARY)
+    if (true) // GCJ LOCAL
       {
         System.loadLibrary("gtkpeer");
       }

diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class
index 9fcc24310b49b326587463ba2cb10a5c4eda5ba4..6e09628a3ad0bf2f0af19afa12f904df6cc73173 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class differ

diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class
index 839acb4c958a09a643e6d150f38a63b3eeec14ad..1a1b941a8d23e1430c612b9916f7c0f7f1e5dac3 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class differ

diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class
index d9feb6be6dd9ce9813c22e4a0af9259b7fe4ac1e..e9a29650605773a64fc185aa065dc7ad4d9cfcc8 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class differ

diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class
index e53fa21ce722cc5dad428e1dc91e98b35a0afc4d..c2c2c9ad20e1faf5dd21bbf0b7ba080073e1dbe5 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class differ

diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class
index 114b8f00e57980d75fe239811f8548042130d8f6..be0c9261f811b6d95e2ee32a10631080ff350641 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class differ

diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class
index abdb577004af906a23a348800ac7122067913346..051b67b222c97653308f0854237a4ea20f6a2fd4 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class differ

diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleData.class b/libjava/classpath/lib/gnu/java/locale/LocaleData.class
index f2772bbdd139564560ce07e6628adbfa5f551f29..338cc8fc352a2d477e3f498381944692138b1126 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/locale/LocaleData.class and b/libjava/classpath/lib/gnu/java/locale/LocaleData.class differ