diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/CHANGES b/mozilla/plugin/oji/MRJCarbon/plugin/CHANGES index 21b0e7c09c6..347d2a8c37d 100644 --- a/mozilla/plugin/oji/MRJCarbon/plugin/CHANGES +++ b/mozilla/plugin/oji/MRJCarbon/plugin/CHANGES @@ -6,6 +6,12 @@ to be correctly resized before calling MoveAndClipJavaControl(). 2. Fixed LiveConnect method that was causing stale plugin instance references to be retained in the active plugin list. +3. Changed TimedMessage handling so it uses the system memory allocators. This fixes some issues +that we were seeing when Carbon event handlers were being fired during event processing. + +4. Added versioning strings to the mimetype list to improve compatibility with websites that +insist on declaring their applets using the "x-java-applet;version=x.x.x" format. + Changes since 1.0b1: 1. Repaired Security Context code that was broken by the checkin for bug 124042. This code now diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/INSTALL.txt b/mozilla/plugin/oji/MRJCarbon/plugin/INSTALL.txt index 7a4dbb6835f..8cf7494fceb 100644 --- a/mozilla/plugin/oji/MRJCarbon/plugin/INSTALL.txt +++ b/mozilla/plugin/oji/MRJCarbon/plugin/INSTALL.txt @@ -1,10 +1,10 @@ -MRJPluginCarbon v1.0b2 Install Note +MRJPluginCarbon v1.0fc1 Install Notes This short document explains how to install the MRJ Plugin for Mac OS X. There are two ways to install the current development release of the MRJ Plugin for Mac OS X: -1. The simplest method is to create an alias to the file "MRJPluginCarbon" in "/Library/Internet Plugins." As long as you leave the original "MRJPluginCarbon-1.0b2" folder intact somewhere on your hard disk, this will work just fine. +1. The simplest method is to create an alias to the file "MRJPluginCarbon" in "/Library/Internet Plugins." As long as you leave the original "MRJPluginCarbon" folder intact somewhere on your hard disk, this will work just fine. -2. Copy the contents of the "MRJPluginCarbon-1.0b2" folder into "/Library/Internet Plugins." This should be a total of 4 files: MRJPlugin.jar, MRJPlugin.policy, MRJPlugin.properties +2. Copy the contents of the "MRJPluginCarbon" folder into "/Library/Internet Plugins." This should be a total of 4 files: MRJPlugin.jar, MRJPlugin.policy, MRJPlugin.properties and MRJPluginCarbon. The first method is preferred, because you only have to add a single file to "/Library/Internet Plugins." diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.properties b/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.properties index afa76291eff..44bdcb28ef8 100644 --- a/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.properties +++ b/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.properties @@ -1,4 +1,4 @@ # MRJPlugin.properties netscape.oji.plugin.console.append=false -netscape.oji.plugin.version=1.0b2 +netscape.oji.plugin.version=1.0fc1 netscape.oji.plugin.security=com.apple.mrj.JavaEmbedding.JE_AppletSecurity diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc b/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc index 3df9fa67d89..2ef1b2f7523 100644 Binary files a/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc and b/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc differ