CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Lillian Angel <langel> 06/06/06 15:27:57
Modified files:
. : ChangeLog
native/plugin : gcjwebplugin.cc
Log message:
2006-06-06 Lillian Angel <[EMAIL PROTECTED]>
* native/plugin/gcjwebplugin.cc:
Fixed failure message and commenting.
(NP_Initialize): Added more comments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7679&r2=1.7680
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7679
retrieving revision 1.7680
diff -u -b -r1.7679 -r1.7680
--- ChangeLog 6 Jun 2006 15:12:08 -0000 1.7679
+++ ChangeLog 6 Jun 2006 15:27:56 -0000 1.7680
@@ -1,3 +1,9 @@
+2006-06-06 Lillian Angel <[EMAIL PROTECTED]>
+
+ * native/plugin/gcjwebplugin.cc:
+ Fixed failure message and commenting.
+ (NP_Initialize): Added more comments.
+
2006-06-06 David Gilbert <[EMAIL PROTECTED]>
* javax/swing/JSplitPane.java
Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- native/plugin/gcjwebplugin.cc 5 Jun 2006 18:20:15 -0000 1.3
+++ native/plugin/gcjwebplugin.cc 6 Jun 2006 15:27:57 -0000 1.4
@@ -136,7 +136,8 @@
"Your whitelist file is \"" WHITELIST_FILENAME "\"."
#define FAILURE_MESSAGE \
"This page wants to load an applet.\n" \
- "There is no appletviewer installed in \"" APPLETVIEWER_EXECUTABLE "\"." \
+ "The appletviewer is missing or not installed properly in \"" \
+ APPLETVIEWER_EXECUTABLE "\"."
// Documentbase retrieval required definition.
static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
@@ -144,7 +145,7 @@
// Browser function table.
static NPNetscapeFuncs browserFunctions;
-// Keeps track of initialization. NP_INITIALIZE should only be
+// Keeps track of initialization. NP_Initialize should only be
// called once.
bool initialized = false;
@@ -1559,6 +1560,11 @@
// implement and initializes a local table with browser functions that
// we may wish to call. Called once, after browser startup and before
// the first plugin instance is created.
+// The field 'initialized' is set to true once this function has
+// finished. If 'initialized' is already true at the beginning of
+// this function, then it is evident that NP_Initialize has already
+// been called. There is no need to call this function more than twice and
+// this workaround avoids any duplicate calls.
NPError
NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
{
