Bug 479614 - [Graphics] HiDPI support for eclipse platform

Revert unnecessary native file changes in GTK (generated by older
versions of SWT tools)

Change-Id: I3e9af787d2ebb72f79820809bc2cd0cd5b361547

2 files changed, 0 insertions, 428 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
index 7aeca2a702..c68f3f75b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
@@ -101,24 +101,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3BJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3BJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3BI_FUNC);
 #else
@@ -140,24 +126,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3CJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3CJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3CI_FUNC);
 #else
@@ -179,24 +151,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3DJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3DJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3DI_FUNC);
 #else
@@ -218,24 +176,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3FJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3FJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3FI_FUNC);
 #else
@@ -257,24 +201,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3IJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3IJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3II_FUNC);
 #else
@@ -296,24 +226,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3JJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3JJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3JI_FUNC);
 #else
@@ -335,24 +251,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove__J_3SJ)(JNIEnv *env, jclass that, jintLo
 #else
 	C_NATIVE_ENTER(env, that, memmove__J_3SJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetShortArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseShortArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3SI_FUNC);
 #else
@@ -374,24 +276,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3BJJ)(JNIEnv *env, jclass that, jbyteA
 #else
 	C_NATIVE_ENTER(env, that, memmove___3BJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3BII_FUNC);
 #else
@@ -414,28 +302,12 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CJ)(JNIEnv *env, jclass that, jbyt
 #else
 	C_NATIVE_ENTER(env, that, memmove___3B_3CJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-		if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
-		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3B_3CI_FUNC);
 #else
@@ -457,24 +329,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3CJJ)(JNIEnv *env, jclass that, jcharA
 #else
 	C_NATIVE_ENTER(env, that, memmove___3CJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3CII_FUNC);
 #else
@@ -496,24 +354,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3DJJ)(JNIEnv *env, jclass that, jdoubl
 #else
 	C_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3DII_FUNC);
 #else
@@ -535,24 +379,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3FJJ)(JNIEnv *env, jclass that, jfloat
 #else
 	C_NATIVE_ENTER(env, that, memmove___3FJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3FII_FUNC);
 #else
@@ -574,24 +404,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3IJJ)(JNIEnv *env, jclass that, jintAr
 #else
 	C_NATIVE_ENTER(env, that, memmove___3IJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3III_FUNC);
 #else
@@ -615,24 +431,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BJ)(JNIEnv *env, jclass that, jint
 	C_NATIVE_ENTER(env, that, memmove___3I_3BJ_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)lparg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-	}
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3I_3BI_FUNC);
@@ -655,24 +457,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3JJJ)(JNIEnv *env, jclass that, jlongA
 #else
 	C_NATIVE_ENTER(env, that, memmove___3JJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3JII_FUNC);
 #else
@@ -694,24 +482,10 @@ JNIEXPORT void JNICALL C_NATIVE(memmove___3SJJ)(JNIEnv *env, jclass that, jshort
 #else
 	C_NATIVE_ENTER(env, that, memmove___3SJJ_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetShortArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseShortArrayElements(env, arg0, lparg0, 0);
-	}
 #ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3SII_FUNC);
 #else
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index c367399fa7..46ac1e3cda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -4599,36 +4599,16 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
 	jintLong *lparg4=NULL;
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
 		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	}
 	rc = (jintLong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-		if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1g_1utf16_1to_1utf8_FUNC);
 	return rc;
 }
@@ -4686,32 +4666,14 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *
 #else
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
 		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	}
 	rc = (jintLong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
-	} else
-#endif
-	{
-		if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	}
 #ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
 #else
@@ -4738,36 +4700,16 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv
 #else
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
 #endif
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
 		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	}
 	rc = (jintLong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	}
 #ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
 #else
@@ -5320,24 +5262,10 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1intern)
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	rc = (jintLong)gdk_atom_intern((const gchar *)lparg0, arg1);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1atom_1intern_FUNC);
 	return rc;
 }
@@ -5372,14 +5300,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 /*
 	rc = (jintLong)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
 */
@@ -5390,14 +5311,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
 		}
 	}
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
 	return rc;
 }
@@ -6146,14 +6060,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1lines)
 {
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1lines_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	}
 /*
 	gdk_draw_lines(arg0, arg1, (GdkPoint *)lparg2, (gint)arg3);
 */
@@ -6164,14 +6071,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1lines)
 		}
 	}
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1lines_FUNC);
 }
 #endif
@@ -6218,14 +6118,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1polygon)
 {
 	jint *lparg3=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1polygon_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	}
 /*
 	gdk_draw_polygon(arg0, arg1, arg2, lparg3, arg4);
 */
@@ -6236,14 +6129,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1polygon)
 		}
 	}
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1polygon_FUNC);
 }
 #endif
@@ -6313,16 +6199,8 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drawable_1get_1size)
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1size_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	}
 /*
 	gdk_drawable_get_size(arg0, (gint *)lparg1, (gint *)lparg2);
 */
@@ -6333,16 +6211,8 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drawable_1get_1size)
 		}
 	}
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, 0);
-	} else
-#endif
-	{
-		if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-		if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1size_FUNC);
 }
 #endif
@@ -6674,14 +6544,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1dashes)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1dashes_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	}
 /*
 	gdk_gc_set_dashes(arg0, (gint)arg1, (gint8 *)lparg2, (gint)arg3);
 */
@@ -6692,14 +6555,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1dashes)
 		}
 	}
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1dashes_FUNC);
 }
 #endif
@@ -7307,16 +7163,8 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixmap_1get_1size)
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1get_1size_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	}
 /*
 	gdk_pixmap_get_size(arg0, (gint *)lparg1, (gint *)lparg2);
 */
@@ -7327,16 +7175,8 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixmap_1get_1size)
 		}
 	}
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, 0);
-	} else
-#endif
-	{
-		if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-		if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1get_1size_FUNC);
 }
 #endif
@@ -20750,24 +20590,10 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1from_1string_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	}
 	rc = (jintLong)pango_font_description_from_string((const char *)lparg0);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1from_1string_FUNC);
 	return rc;
 }
@@ -20863,24 +20689,10 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1family)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1family_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	pango_font_description_set_family((PangoFontDescription *)arg0, (const char *)lparg1);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1set_1family_FUNC);
 }
 #endif
@@ -21588,24 +21400,10 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1text)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1text_FUNC);
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	} else
-#endif
-	{
-		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	}
 	pango_layout_set_text((PangoLayout *)arg0, (const char *)lparg1, (int)arg2);
 fail:
-#ifdef JNI_VERSION_1_2
-	if (IS_JNI_1_2) {
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	} else
-#endif
-	{
-		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-	}
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1set_1text_FUNC);
 }
 #endif