From da03d24bfec77ca69554b650381f9a39b8d745ee Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Sun, 1 Aug 2004 19:39:40 +0000 Subject: [PATCH] Author: Michael r=edburns M webclient/src_moz/HistoryImpl.cpp - Incorrectly passing jboolean to mozilla methods, pass PRBool instead. git-svn-id: svn://10.0.0.236/trunk@160193 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/webclient/src_moz/HistoryImpl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/java/webclient/src_moz/HistoryImpl.cpp b/mozilla/java/webclient/src_moz/HistoryImpl.cpp index a0fab79e574..e9251300905 100644 --- a/mozilla/java/webclient/src_moz/HistoryImpl.cpp +++ b/mozilla/java/webclient/src_moz/HistoryImpl.cpp @@ -59,7 +59,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanBack (JNIEnv *env, jobject obj, jint nativeBCPtr) { - jboolean result = JNI_FALSE; + PRBool result = PR_FALSE; JNIEnv * pEnv = env; jobject jobj = obj; @@ -67,7 +67,7 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanBac if (nativeBrowserControl == nsnull) { ::util_ThrowExceptionToJava(env, "Exception: null nativeBCPtr passed to nativeCanBack"); - return result; + return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; } nsresult rv = @@ -76,7 +76,7 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanBac ::util_ThrowExceptionToJava(env, "Exception: Can't GetCanGoBack"); } - return result; + return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; } JNIEXPORT void JNICALL @@ -106,7 +106,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanForward (JNIEnv *env, jobject obj, jint nativeBCPtr) { - jboolean result = JNI_FALSE; + PRBool result = JNI_FALSE; JNIEnv * pEnv = env; jobject jobj = obj; @@ -114,7 +114,7 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanFor if (nativeBrowserControl == nsnull) { ::util_ThrowExceptionToJava(env, "Exception: null nativeBCPtr passed to nativeCanForward"); - return result; + return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; } nsresult rv = @@ -123,7 +123,7 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanFor ::util_ThrowExceptionToJava(env, "Exception: Can't GetCanGoForward"); } - return result; + return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; }