Updated these files.

java/webclient/src/BrowserControlMozillaShim.cpp

@@ -352,6 +352,11 @@ InitEmbeddedEventHandler (WebShellInitContext* initContext)
 	    return;
         }
     }
+#ifdef XP_UNIX
+    // PENDING(mark): HACK! Sleep for 3 seconds just to make sure everything
+    // starts up correctly. Not sure why this helps yet.
+    ::PR_Sleep(PR_SecondsToInterval(3));
+#endif
 }
 
 
@@ -1496,7 +1501,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellCanBack (
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
-		  Sleep(0);
+            //PENDING(mark): Why not just use PR_Sleep?
+            Sleep(0);
+#else
+            ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1543,7 +1551,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellCanForward (
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1590,7 +1601,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellBack (
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1637,7 +1651,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellForward (
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1685,7 +1702,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellGoTo (
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1732,7 +1752,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellGetHistoryLen
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1779,7 +1802,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellGetHistoryInd
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();
@@ -1828,7 +1854,10 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeWebShellGetURL (
 
 		while (actionEvent->isComplete() == PR_FALSE) {
 #ifndef XP_UNIX
+            //PENDING(mark): Why not just use PR_Sleep?
 			Sleep(0);
+#else
+          ::PR_Sleep(PR_INTERVAL_NO_WAIT);
 #endif
 		}
 		voidResult = actionEvent->getResult();

java/webclient/src/nsActions.cpp

@@ -145,6 +145,8 @@ wsLoadURLEvent::handleEvent ()
 		nsresult rv = mWebShell->LoadURL(mURL->GetUnicode());
 
 		printf("result = %lx\n", rv);
+
+        PR_Sleep(PR_SecondsToInterval(5));
 	}
 	return NULL;
 } // handleEvent()

java/webclient/src/runem.solaris

@@ -11,7 +11,7 @@ JDK_LOCATION=${JDKHOME}
 # paths it gives you!!!!
 GTKLIBS=/opt/local/lib:/usr/openwin/lib:/usr/dt/lib
 # For Solaris
-LD_LIBRARY_PATH=${JDK_LOCATION}/jre/lib/solaris:${MOZILLA_DIST}/bin:${GTKLIBS}:.:/usr/local/lib:/usr/lib:/lib:.
+LD_LIBRARY_PATH=${JDK_LOCATION}/jre/lib/solaris:${MOZILLA_DIST}/bin:${GTKLIBS}:.:/usr/local/lib:/usr/lib:/lib
 export LD_LIBRARY_PATH
 JAVA=${JDK_LOCATION}/bin/java
 OUTPUT_DIR=${MOZILLA_DIST}/classes

java/webclient/src/runem.unix

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-MOZILLA_TOP=${PWD}/../../..
-MOZILLA_DIST=${MOZILLA_TOP}/dist
-MOZILLA_FIVE_HOME=${MOZILLA_DIST}/bin
-export MOZILLA_FIVE_HOME
-
-# Standard JDK 1.2 location
-JDK_LOCATION=${JDKHOME}
-# Native Threads
-LD_LIBRARY_PATH=${JDK_LOCATION}/jre/lib/i386:${JDK_LOCATION}/jre/lib/i386/classic:${JDK_LOCATION}/jre/lib/i386/native_threads:${MOZILLA_DIST}/bin:.:/usr/local/lib:/usr/lib:/lib:.
-# Green Threads
-#LD_LIBRARY_PATH=${JDK_LOCATION}/jre/lib/i386:${JDK_LOCATION}/jre/lib/i386/classic:${JDK_LOCATION}/jre/lib/i386/green_threads:${MOZILLA_DIST}/bin:.:/usr/local/lib:/usr/lib:/lib
-export LD_LIBRARY_PATH
-JAVA=${JDK_LOCATION}/bin/java
-OUTPUT_DIR=${MOZILLA_DIST}/classes
-# JDK 1.2 CLASSES
-CLASSES=${JDK_LOCATION}/lib/tools.jar:${JDK_LOCATION}/lib/rt.jar:${OUTPUT_DIR}
-CLASSNAME=org.mozilla.webclient.test.EmbeddedMozilla
-
-# For debugging...
-#${JAVA} -verbose:jni -Xcheck:jni -classpath ${CLASSES} ${CLASSNAME} $1
-echo
-echo "===================================================================="
-echo JDKHOME=${JDKHOME}
-echo "===================================================================="
-echo CLASSPATH=${CLASSES}
-echo "===================================================================="
-echo MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}
-echo "===================================================================="
-echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-echo "===================================================================="
-echo
-${JAVA} -classpath ${CLASSES} ${CLASSNAME} $1 $2 $3 $4 $5
-
-
-