CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Lillian Angel <langel> 06/06/13 21:39:21
Modified files:
. : ChangeLog
native/plugin : gcjwebplugin.cc
Log message:
2006-06-13 Lillian Angel <[EMAIL PROTECTED]>
* native/plugin/gcjwebplugin.cc
(NP_Initialize): Removed code to create whitelist file.
(GCJ_New): Added code to create whitelist file.
(plugin_user_trusts_documentbase): Fixed error message.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7804&r2=1.7805
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7804
retrieving revision 1.7805
diff -u -b -r1.7804 -r1.7805
--- ChangeLog 13 Jun 2006 21:08:10 -0000 1.7804
+++ ChangeLog 13 Jun 2006 21:39:21 -0000 1.7805
@@ -1,3 +1,10 @@
+2006-06-13 Lillian Angel <[EMAIL PROTECTED]>
+
+ * native/plugin/gcjwebplugin.cc
+ (NP_Initialize): Removed code to create whitelist file.
+ (GCJ_New): Added code to create whitelist file.
+ (plugin_user_trusts_documentbase): Fixed error message.
+
2006-06-13 David Gilbert <[EMAIL PROTECTED]>
* javax/swing/plaf/metal/MetalIconFactory.java
Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- native/plugin/gcjwebplugin.cc 9 Jun 2006 14:53:34 -0000 1.11
+++ native/plugin/gcjwebplugin.cc 13 Jun 2006 21:39:21 -0000 1.12
@@ -324,6 +324,26 @@
goto cleanup_appletviewer_mutex;
}
+ // Open the user's documentbase whitelist.
+ whitelist_file = g_io_channel_new_file (whitelist_filename,
+ "a+", &channel_error);
+ if (!whitelist_file)
+ {
+ if (channel_error)
+ {
+ PLUGIN_ERROR_THREE ("Failed to open whitelist file",
+ whitelist_filename,
+ channel_error->message);
+ g_error_free (channel_error);
+ channel_error = NULL;
+ }
+ else
+ PLUGIN_ERROR_TWO ("Failed to open whitelist file",
+ whitelist_filename);
+
+ return NPERR_GENERIC_ERROR;
+ }
+
if (!plugin_user_trusts_documentbase (documentbase))
{
PLUGIN_ERROR ("User does not trust applet.");
@@ -959,7 +979,7 @@
channel_error = NULL;
}
else
- PLUGIN_ERROR ("Failed to open whitelist file.");
+ PLUGIN_ERROR ("Failed to read line from whitelist file.");
g_free (whitelist_entry);
whitelist_entry = NULL;
break;
@@ -1632,26 +1652,6 @@
}
}
- // Open the user's documentbase whitelist.
- whitelist_file = g_io_channel_new_file (whitelist_filename,
- "a+", &channel_error);
- if (!whitelist_file)
- {
- if (channel_error)
- {
- PLUGIN_ERROR_THREE ("Failed to open whitelist file",
- whitelist_filename,
- channel_error->message);
- g_error_free (channel_error);
- channel_error = NULL;
- }
- else
- PLUGIN_ERROR_TWO ("Failed to open whitelist file",
- whitelist_filename);
-
- return NPERR_GENERIC_ERROR;
- }
-
// Store in a local table the browser functions that we may use.
browserFunctions.version = browserTable->version;
browserFunctions.size = browserTable->size;
