[java-atk-wrapper] make JNI Version check conditional



commit d5da1d0a85f80b708e02e355508db4b7924b40d9
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sat Nov 15 15:20:39 2014 +0000

    make JNI Version check conditional
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=740173

 jni/src/AtkWrapper.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index 8979d0a..2a397c1 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -58,8 +58,15 @@ static gboolean (*origin_g_idle_dispatch) (GSource*, GSourceFunc, gpointer);
 
 static GModule* module_atk_bridge = NULL;
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *javaVM, void *reserve) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *javaVM, void *reserve)
+{
+  JNIEnv *env;
   globalJvm = javaVM;
+
+  if ((*javaVM)->GetEnv(javaVM, (void **)&env, JNI_VERSION_1_2))
+  {
+    return JNI_ERR; /* Not supported */
+  }
   return JNI_VERSION_1_2;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]