Webclient compiles and runs with MOZILLA_0_9_9_BRANCH.

java/dom/src/nsJavaDOMImpl.cpp

@@ -37,6 +37,7 @@
 #include "nsIGenericFactory.h"
 
 #include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
 #include "nsCOMPtr.h"
 
 #if defined(DEBUG)
@@ -306,10 +307,11 @@ NS_IMETHODIMP nsJavaDOMImpl::OnProgressChange(nsIWebProgress *aWebProgress,
     nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
     if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
 	NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
-	urlSpec = (char *) urlSpecString.GetBufferHandle();
+	urlSpec = ToNewCString(urlSpecString);
     }
     
     jstring jURL = env->NewStringUTF(urlSpec);
+    nsMemory::Free(urlSpec);
     if (!jURL) return NS_ERROR_FAILURE;
     // PENDING(edburns): this leaks.
     
@@ -345,9 +347,10 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStatusChange(nsIWebProgress *aWebProgress,
     nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
     if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
 	NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
-	urlSpec = (char *) urlSpecString.GetBufferHandle();
+	urlSpec = ToNewCString(urlSpecString);
     }
     jstring jURL = env->NewStringUTF(urlSpec);
+    nsMemory::Free(urlSpec);
     if (!jURL) return NS_ERROR_FAILURE;
     // PENDING(edburns): this leaks
 
@@ -414,10 +417,11 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndDocumentLoad(nsIWebProgress *aWebProgress,
   nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
   if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
       NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
-      urlSpec = (char *) urlSpecString.GetBufferHandle();
+	urlSpec = ToNewCString(urlSpecString);
   }
 
   jstring jURL = env->NewStringUTF(urlSpec);
+  nsMemory::Free(urlSpec);
   if (!jURL) return NS_ERROR_FAILURE;
   
   env->CallStaticVoidMethod(domAccessorClass,
@@ -448,10 +452,11 @@ NS_IMETHODIMP nsJavaDOMImpl::doStartURLLoad(nsIWebProgress *aWebProgress,
   nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
   if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
       NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
-      urlSpec = (char *) urlSpecString.GetBufferHandle();
+	urlSpec = ToNewCString(urlSpecString);
   }
   
   jstring jURL = env->NewStringUTF(urlSpec);
+  nsMemory::Free(urlSpec);
   if (!jURL) return NS_ERROR_FAILURE;
 
   char* contentType = (char*) "";
@@ -491,10 +496,11 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndURLLoad(nsIWebProgress *aWebProgress,
   nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
   if (channel && NS_SUCCEEDED(channel->GetURI(&url)) &&
       NS_SUCCEEDED(url->GetSpec(urlSpecString))) {
-      urlSpec = (char *) urlSpecString.GetBufferHandle();
+      urlSpec = ToNewCString(urlSpecString);
   }
   
   jstring jURL = env->NewStringUTF(urlSpec);
+  nsMemory::Free(urlSpec);
   if (!jURL) return NS_ERROR_FAILURE;
 
 #if defined(DEBUG)

java/webclient/src_moz/CurrentPageActionEvents.cpp

@@ -45,6 +45,7 @@
 #include "nsIURI.h"
 #include "nsIHistoryEntry.h"
 #include "nsString.h"
+#include "nsReadableUtils.h"
 
 wsCopySelectionEvent::wsCopySelectionEvent(WebShellInitContext *yourInitContext) :
         nsActionEvent(),
@@ -251,7 +252,7 @@ wsGetURLEvent::handleEvent ()
 	if (NS_FAILED(rv)) {
         return result;
     }
-    currentURL = (char *) urlSpecString.GetBufferHandle();
+    currentURL = ToNewCString(urlSpecString);
     
     result = (void *) currentURL;
     }

java/webclient/src_moz/CurrentPageImpl.cpp

@@ -139,7 +139,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPage
 			return nsnull;
 		}
         
-        nsCRT::free(charResult);
+        nsMemory::Free(charResult);
 	}
     
 	return urlString;

java/webclient/src_moz/HistoryActionEvents.cpp

@@ -36,6 +36,7 @@
 #include "nsIHistoryEntry.h"
 #include "nsIURI.h"
 #include "nsString.h"
+#include "nsReadableUtils.h"
 
 /*
  * wsCanBackEvent
@@ -257,7 +258,7 @@ wsGetURLForIndexEvent::handleEvent ()
         nsresult rv;
         nsISHistory* sHistory;
         rv = mInitContext->webNavigation->GetSessionHistory(&sHistory);
-        const char *indexURL = nsnull;
+        char *indexURL = nsnull;
         
         nsIHistoryEntry * Entry;
         rv = sHistory->GetEntryAtIndex(mHistoryIndex, PR_FALSE, &Entry);
@@ -279,7 +280,7 @@ wsGetURLForIndexEvent::handleEvent ()
             return result;
         }	
         
-        indexURL = urlSpecString.get();
+        indexURL = ToNewCString(urlSpecString);
         result = (void *) indexURL;
     }
     return result;

java/webclient/src_moz/HistoryImpl.cpp

@@ -269,7 +269,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl
 {
     JNIEnv	*	pEnv = env;
     jobject		jobj = obj;
-    const char	*	charResult = nsnull;
+    char	*	charResult = nsnull;
     jstring		urlString = nsnull;
     
     WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
@@ -284,7 +284,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl
             new wsGetURLForIndexEvent(initContext, historyIndex);
         PLEvent	   	  	* event       = (PLEvent*) *actionEvent;
         
-        charResult = (const char *) ::util_PostSynchronousEvent(initContext, 
+        charResult = (char *) ::util_PostSynchronousEvent(initContext, 
                                                                 event);
         
         if (charResult != nsnull) {
@@ -294,6 +294,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl
             ::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned nsnull");
             return nsnull;
         }
+        nsMemory::Free((void *) charResult);
     }
     
     return urlString;