10139N/Adiff -uNr glib-java-0.4.2.orig/src/jni/org_gnu_glib_GObject.c glib-java-0.4.2/src/jni/org_gnu_glib_GObject.c

10139N/A--- glib-java-0.4.2.orig/src/jni/org_gnu_glib_GObject.c 2008-09-04 15:54:32.666613782 +0100

10139N/A+++ glib-java-0.4.2/src/jni/org_gnu_glib_GObject.c 2008-09-04 15:54:45.516326561 +0100

10139N/A@@ -794,6 +794,8 @@

10139N/A JNIEXPORT void JNICALL Java_org_gnu_glib_GObject_registerLogHandler

10139N/A (JNIEnv *env, jclass cls)

10139N/A {

10139N/A+/* #6728675: glib-java's JNI abuse causes jvm crashes when glib logs - Workaround, just stub out logging

10139N/A+

10139N/A g_log_set_handler(NULL, G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL |

10139N/A G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, logFunc, (gpointer)env);

10139N/A g_log_set_handler ("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL

10139N/A@@ -806,6 +808,7 @@

10139N/A | G_LOG_FLAG_RECURSION, logFunc, (gpointer) env);

10139N/A g_log_set_handler ("Glade", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL

10139N/A | G_LOG_FLAG_RECURSION, logFunc, (gpointer) env);

10139N/A+*/

10139N/A }

10139N/A

10139N/A JNIEXPORT jobject JNICALL Java_org_gnu_glib_GObject_g_1object_1new

10139N/A