Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge in warren's changes from the old branch

Browse Source 
git-svn-id: svn://10.0.0.236/branches/OJI_19980430_BRANCH@1122 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jgellman
1998-05-05 02:20:21 +00:00
parent 3612c20491
commit e6aac796a1
67 changed files with 837 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/cmd/winfe/feutil.cpp
View File

@@ -28,9 +28,14 @@
#include "toolbar2.h"
#include "VerReg.h"
#include "libmocha.h"
#include "java.h"
#include "ngdwtrst.h"
#if defined(OJI)
#include "jvmmgr.h"
#elif defined(JAVA)
#include "java.h"
#endif
extern "C" {
#include "xpgetstr.h"
extern int XP_ALERT_NETCASTER_NO_JS;
@@ -1776,9 +1781,21 @@ void FEU_OpenNetcaster(void)
if (regErr == REGERR_OK) {
BOOL javaEnabled = FALSE;
#if defined(OJI)
JVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr) {
NPIJVMPlugin* jvm = jvmMgr->GetJVM();
if (jvm) {
javaEnabled = jvm->GetJVMEnabled();
}
jvmMgr->Release();
}
#elif defined(JAVA)
javaEnabled = LJ_GetJavaEnabled();
#endif
// Now check to see if Java and JS are enabled
if (!LM_GetMochaEnabled() || !LJ_GetJavaEnabled()) {
if (!LM_GetMochaEnabled() || !javaEnabled) {
MessageBox(NULL, XP_GetString(XP_ALERT_NETCASTER_NO_JS), szLoadString(AFX_IDS_APP_TITLE), MB_OK | MB_ICONEXCLAMATION);
return;
}