Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M Makefile.win

Browse Source 
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:
edburns%acm.org
2002-04-15 17:38:52 +00:00
parent d1d308ecd3
commit 579dbe6ec7
25 changed files with 290 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mozilla/java/dom/src/nsJavaDOMImpl.cpp
View File

@@ -299,12 +299,16 @@ NS_IMETHODIMP nsJavaDOMImpl::OnProgressChange(nsIWebProgress *aWebProgress,
JNIEnv* env = NULL;
if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE;
nsCString urlSpecString;
char* urlSpec = (char*) "";
nsIURI* url = nsnull;
nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)))
url->GetSpec(&urlSpec);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
urlSpec = (char *) urlSpecString.GetBufferHandle();
}
jstring jURL = env->NewStringUTF(urlSpec);
if (!jURL) return NS_ERROR_FAILURE;
// PENDING(edburns): this leaks.
@@ -336,10 +340,13 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStatusChange(nsIWebProgress *aWebProgress,
if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE;
char* urlSpec = (char*) "";
nsCString urlSpecString;
nsIURI* url = nsnull;
nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)))
url->GetSpec(&urlSpec);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
urlSpec = (char *) urlSpecString.GetBufferHandle();
}
jstring jURL = env->NewStringUTF(urlSpec);
if (!jURL) return NS_ERROR_FAILURE;
// PENDING(edburns): this leaks
@@ -402,10 +409,14 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndDocumentLoad(nsIWebProgress *aWebProgress,
if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE;
char* urlSpec = (char*) "";
nsCString urlSpecString;
nsIURI* url = nsnull;
nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)))
url->GetSpec(&urlSpec);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
urlSpec = (char *) urlSpecString.GetBufferHandle();
}
jstring jURL = env->NewStringUTF(urlSpec);
if (!jURL) return NS_ERROR_FAILURE;
@@ -432,10 +443,14 @@ NS_IMETHODIMP nsJavaDOMImpl::doStartURLLoad(nsIWebProgress *aWebProgress,
if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE;
char* urlSpec = (char*) "";
nsCString urlSpecString;
nsIURI* url = nsnull;
nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)))
url->GetSpec(&urlSpec);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
urlSpec = (char *) urlSpecString.GetBufferHandle();
}
jstring jURL = env->NewStringUTF(urlSpec);
if (!jURL) return NS_ERROR_FAILURE;
@@ -470,11 +485,15 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndURLLoad(nsIWebProgress *aWebProgress,
JNIEnv* env = NULL;
if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE;
nsCString urlSpecString;
char* urlSpec = (char*) "";
nsIURI* url = nsnull;
nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)))
url->GetSpec(&urlSpec);
if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
urlSpec = (char *) urlSpecString.GetBufferHandle();
}
jstring jURL = env->NewStringUTF(urlSpec);
if (!jURL) return NS_ERROR_FAILURE;