r=marklin

a=edburns

Changes to complete the transition from BrowserControlMozillaShim to BrowserControlNativeShim.

java/webclient/classes/Makefile.unix

@@ -19,6 +19,6 @@ all:
 	${JAVAH} -jni -classpath ${CLASSES} \
 		-o ${JAVAH_OUTPUT_DIR}/motif/MotifBrowserControlCanvas.h org.mozilla.webclient.motif.MotifBrowserControlCanvas
 	${JAVAH} -jni -classpath ${CLASSES} \
-		-o ${JAVAH_OUTPUT_DIR}/motif/MozillaEventThread.h org.mozilla.webclient.motif.NativeEventThread
+		-o ${JAVAH_OUTPUT_DIR}/motif/NativeEventThread.h org.mozilla.webclient.motif.NativeEventThread
 	${JAVAH} -jni -classpath ${CLASSES} \
 		-o ${JAVAH_OUTPUT_DIR}/BrowserControlNativeShim.h org.mozilla.webclient.BrowserControlNativeShim

java/webclient/src/Makefile.solaris

@@ -43,11 +43,11 @@ component.reg:
 components:
 	${LN} ${DIST}/bin/components
 
-libwebclientstub.so: BrowserControlMozillaShimStub.o MotifBrowserControlCanvasStub.o
-	${MKSHLIB} -o ${DLLNAMESTUB} BrowserControlMozillaShimStub.o MotifBrowserControlCanvasStub.o ${STUBLIBS}
+libwebclientstub.so: BrowserControlNativeShimStub.o MotifBrowserControlCanvasStub.o
+	${MKSHLIB} -o ${DLLNAMESTUB} BrowserControlNativeShimStub.o MotifBrowserControlCanvasStub.o ${STUBLIBS}
 
-libwebclient.so: BrowserControlMozillaShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o DocumentObserver.o
-	${MKSHLIB} -o ${DLLNAME} BrowserControlMozillaShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o DocumentObserver.o ${LIBS}
+libwebclient.so: BrowserControlNativeShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o DocumentObserver.o
+	${MKSHLIB} -o ${DLLNAME} BrowserControlNativeShim.o MotifBrowserControlCanvas.o gtkmozilla.o nsActions.o nsSetupRegistry.o DocumentObserver.o ${LIBS}
 
 gtkmozilla.o: motif/gtkmozilla.cpp
 	${CC} ${DEFINES} ${INCLUDE} -c motif/gtkmozilla.cpp
@@ -58,11 +58,11 @@ MotifBrowserControlCanvasStub.o: motif/MotifBrowserControlCanvasStub.cpp
 MotifBrowserControlCanvas.o: motif/MotifBrowserControlCanvas.cpp
 	${CC} ${DEFINES} ${INCLUDE} -c motif/MotifBrowserControlCanvas.cpp
 
-BrowserControlMozillaShimStub.o: motif/BrowserControlMozillaShimStub.cpp
-	${CC} ${STUBDEFINES} ${STUBINCLUDE} -c motif/BrowserControlMozillaShimStub.cpp
+BrowserControlNativeShimStub.o: motif/BrowserControlNativeShimStub.cpp
+	${CC} ${STUBDEFINES} ${STUBINCLUDE} -c motif/BrowserControlNativeShimStub.cpp
 
-BrowserControlMozillaShim.o: BrowserControlMozillaShim.cpp
-	${CC} ${DEFINES} ${INCLUDE} -c BrowserControlMozillaShim.cpp
+BrowserControlNativeShim.o: BrowserControlNativeShim.cpp
+	${CC} ${DEFINES} ${INCLUDE} -c BrowserControlNativeShim.cpp
 
 motif/nsSetupRegistry.cpp:
 	cd motif

java/webclient/src/motif/MotifBrowserControlCanvasStub.cpp

@@ -31,7 +31,7 @@
 #include <jni.h>
 #include "MotifBrowserControlCanvas.h"
 
-#include "BrowserControlMozillaShimStub.h"
+#include "BrowserControlNativeShimStub.h"
 
 #include <dlfcn.h>