717473 - [10.7] "Java Plugin 2" is "Java Applet Plug-in" on Lion

Status: RESOLVED FIXED

(Camino Graveyard :: Preferences, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

When I was trying to figure out possible bugs to explain why philippe's configure was failing on 10.7, I came across bug 651618.

We don't ever check the filename, but we do check the user-friendly name: 
http://mxr.mozilla.org/camino/source/camino/src/preferences/PreferenceManager.mm#93
http://mxr.mozilla.org/camino/source/camino/src/preferences/PreferenceManager.mm#1340

We need to check for the new name, too (or go through the hassle of mentioned in the comment:

// Ideally Java would be detected by MIME type, but nsIPluginTag doesn't
// expose MIME types, making it more trouble than it's worth.

When Stuart wrote that, he hadn't yet written javaPluginCanBeEnabled.  I'm really not sure of the differences between the purposes of these checks now.  :confused:)

Comment 1

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Oh, but that name might also have been the name of the old Java 1.3 plug-in; we'd need to check on 10.4 to see if that plug-in still existed and if Gecko still tried to load it…

Comment 2

[Stuart Morgan]

(In reply to Smokey Ardisson (not following bugs - do not email) from comment #0)
> When Stuart wrote that, he hadn't yet written javaPluginCanBeEnabled.  I'm
> really not sure of the differences between the purposes of these checks now.
> :confused:)

javaPluginCanBeEnabled tells us if there is a Java plugin, and thus whether the checkbox should be enabled. pluginShouldBeDisabled: tells us if a specific plugin should be enabled or not (based on the UI for Java, and the hidden pref for everything else) so that we can sync the Gecko plugin system's state to the current user pref values (for when pluginreg.dat is nuked).

Comment 3

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Fix

This adds the new 10.7 name.

I checked 10.4 (via cb-xserve01, with some difficulty); 2.1 no longer seems to load the old Java Applet.plugin, so I think we're good.  (On 10.3, the name was "Java Plug-in", so I think we were good on 10.4 even if it managed to load--but then again, Apple did rename a plug-in from 10.6 to 10.7 :P )

Comment 4

[Stuart Morgan]

Comment on attachment 590130 [details] [diff] [review]
Fix

sr=smorgan

Comment 5

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

http://hg.mozilla.org/camino/rev/253810551ba1