diff options
author | Roman Kennke <roman@kennke.org> | 2007-04-03 19:33:45 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2007-04-03 19:33:45 +0000 |
commit | bfc442fc817ea30438cad6117f770aab76f662e3 (patch) | |
tree | 4993b4c16e134997fc3f55f7fce2cf9bd854c4ff /native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c | |
parent | 16d68115c6265f7091ff44f695a53ffe2b909e76 (diff) | |
download | classpath-bfc442fc817ea30438cad6117f770aab76f662e3.tar.gz |
2007-04-03 Roman Kennke <roman@kennke.org>
* gnu/java/awt/peer/gtk/GThreadMutex.java,
* gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
* include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h,
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c,
* native/jni/gtk-peer/gthread-jni.c,
* native/jni/gtk-peer/gthread-jni.h: Removed.
* native/jni/gtk-peer/Makefile.am: Removed obsolete entries
for removed files.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
Removed unused bits from gthread-jni.c.
Diffstat (limited to 'native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c')
-rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c | 8 |
1 files changed, 3 insertions, 5 deletions
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 7629a26e3..5d73af4e6 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 @@ -39,7 +39,6 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkToolkit.h" -#include "gthread-jni.h" #include "jcl.h" #include <gdk/gdkx.h> @@ -114,7 +113,7 @@ double cp_gtk_dpi_conversion_factor; static void jni_lock_cb(); static void jni_unlock_cb(); -static void init_glib_threads(JNIEnv *, jint, jobject); +static void init_glib_threads(jint, jobject); static gboolean post_set_running_flag (gpointer); static gboolean set_running_flag (gpointer); static gboolean clear_running_flag (gpointer); @@ -170,7 +169,7 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, argv[0][0] = '\0'; argv[1] = NULL; - init_glib_threads(env, portableNativeSync, lock); + init_glib_threads(portableNativeSync, lock); /* From GDK 2.0 onwards we have to explicitly call gdk_threads_init */ gdk_threads_init(); @@ -257,7 +256,7 @@ static void jni_unlock_cb() In some release following 0.10, that config.h macro will go away.) */ static void -init_glib_threads(JNIEnv *env, jint portableNativeSync, jobject lock) +init_glib_threads(jint portableNativeSync, jobject lock) { if (portableNativeSync < 0) { @@ -269,7 +268,6 @@ init_glib_threads(JNIEnv *env, jint portableNativeSync, jobject lock) #endif } - (*env)->GetJavaVM( env, &cp_gtk_the_vm ); if (!g_thread_supported ()) { if (portableNativeSync) |