diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win index 8f24e559e91..80a8c424373 100644 --- a/mozilla/java/webclient/src_moz/Makefile.win +++ b/mozilla/java/webclient/src_moz/Makefile.win @@ -150,9 +150,9 @@ buildRunems: !else @echo +++ Creating Commercial Package. Use runem.bat to run the test browser. rm -f runem_win_commercial.bat - @echo if not exist ..\..\webclient.dll copy ..\lib\webclient.dll ..\.. >> runem_win_commercial.bat - @echo if not exist ..\..\components\javadom.dll copy ..\lib\javadom.dll ..\..\components >> runem_win_commercial.bat - @echo if not exist ..\..\components\javadomjni.dll copy ..\lib\javadomjni.dll ..\.. >> runem_win_commercial.bat + @echo copy ..\lib\webclient.dll ..\.. >> runem_win_commercial.bat + @echo copy ..\lib\javadom.dll ..\..\components >> runem_win_commercial.bat + @echo copy ..\lib\javadomjni.dll ..\.. >> runem_win_commercial.bat @echo set CLASSPATH=..\lib\Webclient.jar>> runem_win_commercial.bat @echo $(PERL) .\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem_win_commercial.bat -mkdir $(PACKAGE_EXAMPLE) @@ -170,7 +170,7 @@ buildRunems: chmod 775 $(PACKAGE_EXAMPLE)\runem.bat cp -f $(DEPTH)\java\webclient\src_moz\install_win32.js $(DIST)\install.js cd $(DIST) - zip -r $(DLLNAME)_$(PACKAGE_VER).xpi install.js javadev + zip -r $(DLLNAME)_$(PACKAGE_VER)_win32.xpi install.js javadev !endif !endif diff --git a/mozilla/java/webclient/src_moz/NativeEventThread.cpp b/mozilla/java/webclient/src_moz/NativeEventThread.cpp index 5c9992a6b12..9777e5b6600 100644 --- a/mozilla/java/webclient/src_moz/NativeEventThread.cpp +++ b/mozilla/java/webclient/src_moz/NativeEventThread.cpp @@ -504,10 +504,18 @@ void DoMozInitialization(WebShellInitContext * initContext) ::util_ThrowExceptionToJava(env, "Can't get the profile manager."); return; } - char *argv[1]; + char *argv[3]; argv[0] = strdup(gBinDir); - rv = cmdLine->Initialize(1, argv); + // PENDING(edburns): fix for 70656. Really we should have a way + // for the embedding app to specify which profile to use. + argv[1] = strdup("-p"); + argv[2] = strdup("default"); + printf("debug: edburns: argv[1]: %s argv[2]: %s\n", argv[1], + argv[2]); + rv = cmdLine->Initialize(3, argv); nsCRT::free(argv[0]); + nsCRT::free(argv[1]); + nsCRT::free(argv[2]); if (NS_FAILED(rv)) { ::util_ThrowExceptionToJava(env, "Can't initialize nsICmdLineService."); return;