Hi,
I committed this patch to remove the Configuration.INIT_LOAD_LIBRARY checks from
the GTK peers. These checks are no longer required in GCJ HEAD because of this
patch:
http://gcc.gnu.org/ml/java-patches/2006-q2/msg00263.html
Tom
2006-05-30 Thomas Fitzsimmons <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java (static): Call
System.loadLibrary unconditionally.
* gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise.
* gnu/java/awt/peer/gtk/GdkTextLayout.java: Likewise.
* gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.3
diff -u -r1.3 CairoGraphics2D.java
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java 30 May 2006 11:53:42 -0000 1.3
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java 30 May 2006 22:32:30 -0000
@@ -117,8 +117,7 @@
{
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
- System.loadLibrary("gtkpeer");
+ System.loadLibrary("gtkpeer");
}
/**
Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GdkFontPeer.java
--- gnu/java/awt/peer/gtk/GdkFontPeer.java 29 May 2006 16:14:59 -0000 1.13
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java 30 May 2006 22:32:30 -0000
@@ -64,10 +64,7 @@
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
- {
- System.loadLibrary("gtkpeer");
- }
+ System.loadLibrary("gtkpeer");
initStaticState ();
Index: gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,v
retrieving revision 1.20
diff -u -r1.20 GdkPixbufDecoder.java
--- gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 29 May 2006 16:14:59 -0000 1.20
+++ gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 30 May 2006 22:32:31 -0000
@@ -75,10 +75,8 @@
{
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
- {
- System.loadLibrary("gtkpeer");
- }
+ System.loadLibrary("gtkpeer");
+
initStaticState ();
}
Index: gnu/java/awt/peer/gtk/GdkTextLayout.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,v
retrieving revision 1.7
diff -u -r1.7 GdkTextLayout.java
--- gnu/java/awt/peer/gtk/GdkTextLayout.java 29 May 2006 16:14:59 -0000 1.7
+++ gnu/java/awt/peer/gtk/GdkTextLayout.java 30 May 2006 22:32:31 -0000
@@ -70,10 +70,8 @@
// native side, plumbing, etc.
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
- {
- System.loadLibrary("gtkpeer");
- }
+ System.loadLibrary("gtkpeer");
+
initStaticState ();
}
private native void setText(String str);
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.84
diff -u -r1.84 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java 25 May 2006 15:29:36 -0000 1.84
+++ gnu/java/awt/peer/gtk/GtkToolkit.java 30 May 2006 22:32:32 -0000
@@ -88,8 +88,7 @@
static
{
- if (Configuration.INIT_LOAD_LIBRARY)
- System.loadLibrary("gtkpeer");
+ System.loadLibrary("gtkpeer");
int portableNativeSync;
String portNatSyncProp =