M Makefile.win
M dom/jni/javaDOMEventsGlobals.cpp M dom/jni/makefile.win M dom/jni/nativeDOMProxyListener.cpp M dom/jni/nativeDOMProxyListener.h M dom/jni/org_mozilla_dom_events_EventImpl.cpp M dom/src/makefile.win M dom/src/nsJavaDOMImpl.cpp M webclient/Makefile.win M webclient/classes_spec/Makefile.win M webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java M webclient/src_moz/CBrowserContainer.cpp M webclient/src_moz/CurrentPageActionEvents.cpp M webclient/src_moz/HistoryActionEvents.cpp M webclient/src_moz/HistoryImpl.cpp M webclient/src_moz/InputStreamShim.cpp M webclient/src_moz/Makefile.win M webclient/src_moz/NativeEventThread.cpp M webclient/src_moz/NativeEventThreadActionEvents.cpp M webclient/src_moz/NavigationActionEvents.cpp M webclient/src_moz/NavigationImpl.cpp M webclient/src_moz/PreferencesActionEvents.cpp M webclient/src_moz/PromptActionEvents.cpp M webclient/src_moz/RDFActionEvents.cpp M webclient/src_moz/win32/Makefile.win Changes to make webclient compile and run with MOZILLA_0_9_9_BRANCH. git-svn-id: svn://10.0.0.236/trunk@118989 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -269,7 +269,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl
|
||||
{
|
||||
JNIEnv * pEnv = env;
|
||||
jobject jobj = obj;
|
||||
char * charResult = nsnull;
|
||||
const char * charResult = nsnull;
|
||||
jstring urlString = nsnull;
|
||||
|
||||
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
||||
@@ -284,7 +284,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl
|
||||
new wsGetURLForIndexEvent(initContext, historyIndex);
|
||||
PLEvent * event = (PLEvent*) *actionEvent;
|
||||
|
||||
charResult = (char *) ::util_PostSynchronousEvent(initContext, event);
|
||||
charResult = (const char *) ::util_PostSynchronousEvent(initContext,
|
||||
event);
|
||||
|
||||
if (charResult != nsnull) {
|
||||
urlString = ::util_NewStringUTF(env, (const char *) charResult);
|
||||
@@ -293,8 +294,6 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl
|
||||
::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned nsnull");
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
nsCRT::free(charResult);
|
||||
}
|
||||
|
||||
return urlString;
|
||||
|
||||
Reference in New Issue
Block a user