From aaf9e9d2f5a5a0949e6da75a8b5d870cd70f4689 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org>
Date: Wed, 29 Sep 2004 22:01:26 +0000
Subject: [PATCH] This change-bundle enables webclient to build and run with
 mozilla 1.7. The Preferences unit test currently fails, but the test browser
 runs. Next step is to make all the unit tests run, then produce the source
 and binary distribution for 2.0 alpha 2.

M dom/jni/javaDOMEventsGlobals.cpp

- use nsString.get() instead of nsString.GetBufferHandle()

M webclient/src_moz/NavigationActionEvents.cpp

- don't use ctor initializer for nsString

M webclient/src_moz/ns_util.cpp

- nsString2.h is gone.
---
 java/dom/jni/javaDOMEventsGlobals.cpp             | 2 +-
 java/webclient/src_moz/NavigationActionEvents.cpp | 2 +-
 java/webclient/src_moz/ns_util.cpp                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/dom/jni/javaDOMEventsGlobals.cpp b/java/dom/jni/javaDOMEventsGlobals.cpp
index b7ce1bf47ef..c7977d4b9bb 100644
--- a/java/dom/jni/javaDOMEventsGlobals.cpp
+++ b/java/dom/jni/javaDOMEventsGlobals.cpp
@@ -220,7 +220,7 @@ jobject JavaDOMEventsGlobals::CreateEventSubtype(JNIEnv *env,
         return NULL;
     }
 
-    char* buffer = (char *) eventType.GetBufferHandle();
+    char* buffer = (char *) eventType.get();
 
     if (isEventOfType(mouseEventTypes, buffer) == JNI_TRUE) {
       clazz = mouseEventClass;
diff --git a/java/webclient/src_moz/NavigationActionEvents.cpp b/java/webclient/src_moz/NavigationActionEvents.cpp
index d4a3009c476..4fc1b04e826 100644
--- a/java/webclient/src_moz/NavigationActionEvents.cpp
+++ b/java/webclient/src_moz/NavigationActionEvents.cpp
@@ -100,7 +100,7 @@ wsLoadFromStreamEvent::wsLoadFromStreamEvent(NativeBrowserControl *yourNativeBC,
 
 wsLoadFromStreamEvent::wsLoadFromStreamEvent(NativeBrowserControl *yourNativeBC,
                                              InputStreamShim *yourShim) :
-    nsActionEvent(), mNativeBrowserControl(yourNativeBC), mUriString(nsnull),
+    nsActionEvent(), mNativeBrowserControl(yourNativeBC),
     mContentType(nsnull), mProperties(nsnull), mShim(yourShim)
 {
 }
diff --git a/java/webclient/src_moz/ns_util.cpp b/java/webclient/src_moz/ns_util.cpp
index a11215ad4f2..f23cc9f8f87 100644
--- a/java/webclient/src_moz/ns_util.cpp
+++ b/java/webclient/src_moz/ns_util.cpp
@@ -33,7 +33,7 @@
 #include "nsIStringBundle.h"
 #include "nsIServiceManager.h"
 
-#include "nsString2.h"
+#include "nsString.h"
 
 #include "NativeBrowserControl.h"