537219 - Port |Bug 442730 - composition security options for encrypt should only be one menu item (with checkbox) like signing| to SeaMonkey

Status: RESOLVED FIXED

(SeaMonkey :: Security, defect)

Comment 1

[Serge Gautherie (:sgautherie)]

Attachment: (Av1) Just port it [Checked in: See comment 7]

Comment 2

[[e-mail]]

Comment on attachment 419855 [details] [diff] [review]
(Av1) Just port it
[Checked in: See comment 7]

>+  gSMFields.requireEncryptMessage = !gSMFields.requireEncryptMessage;
>+
>+  if (gSMFields.requireEncryptMessage)
>+  {
>+    // Make sure we have a cert.
>+    if (!gCurrentIdentity.getUnicharAttribute("encryption_cert_name"))
>+    {
>+      gSMFields.requireEncryptMessage = false;
This is a bit ugly, but I guess it matches the ugly signing code...

>+  <menupopup id="optionsMenuPopup"
>+             onpopupshowing="setSecuritySettings(1);">
Can't do this, the options menu popup already has a popup showing handler.

>--- a/mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.js
>+++ b/mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.js
No real change here.

>--- a/mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.xul
>+++ b/mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.xul
Or here.

Comment 3

[Serge Gautherie (:sgautherie)]

(In reply to comment #2)
> >+  <menupopup id="optionsMenuPopup"
> >+             onpopupshowing="setSecuritySettings(1);">
> Can't do this, the options menu popup already has a popup showing handler.

I filed bug 607583 to fix that.

Comment 4

[Serge Gautherie (:sgautherie)]

Comment on attachment 419855 [details] [diff] [review]
(Av1) Just port it
[Checked in: See comment 7]

Please, re-review, now that bug 607583 is fixed.

Comment 5

[[e-mail]]

(In reply to comment #3)
> (In reply to comment #2)
> > >+  <menupopup id="optionsMenuPopup"
> > >+             onpopupshowing="setSecuritySettings(1);">
> > Can't do this, the options menu popup already has a popup showing handler.
> I filed bug 607583 to fix that.
Sigh. That's actually a regression, since the quote message menuitem now doesn't always update when it should. Not that anyone's noticed...

Comment 6

[[e-mail]]

Comment on attachment 419855 [details] [diff] [review]
(Av1) Just port it
[Checked in: See comment 7]

> <!ENTITY menu_securityEncryptRequire.label "Encrypt This Message">
> <!ENTITY menu_securityEncryptRequire.accesskey "E">
> 
>-<!ENTITY menu_securityNoEncryption.label "Do Not Encrypt This Message">
>-<!ENTITY menu_securityNoEncryption.accesskey "N">
>-
> <!ENTITY menu_securitySign.label "Digitally Sign This Message">
>-<!ENTITY menu_securitySign.accesskey "S">
>+<!ENTITY menu_securitySign.accesskey "M">
Please post an appropriate announcement that these menuitems have moved and they may need new access keys. r=me without the unrelated changes.

Comment 7

[Serge Gautherie (:sgautherie)]

Comment on attachment 419855 [details] [diff] [review]
(Av1) Just port it
[Checked in: See comment 7]

http://hg.mozilla.org/comm-central/rev/472dbfde9ffd
Av1, with comment 6 suggestion(s).

Comment 8

[Serge Gautherie (:sgautherie)]

(In reply to comment #6)
> Please post an appropriate announcement that these menuitems have moved and
> they may need new access keys.

I don't know what/where to post :-|

Comment 9

[[e-mail]]

mozilla.dev.l10n (or its mailing list) perhaps?

Comment 10

[Serge Gautherie (:sgautherie)]

(In reply to comment #9)
> mozilla.dev.l10n (or its mailing list) perhaps?

Done.