1669070 - Remove SMIME overlay files from SeaMonkey

Status: RESOLVED FIXED

(SeaMonkey :: MailNews: Composition, task)

Description

[Frank-Rainer Grahl (:frg)]

Thunderbird removed some SMIME overlays in
Bug 1444598 Inline the msgReadSMIMEOverlay.xul
Bug 1444601 Inline the msgHdrViewSMIMEOverlay.xul
Bug 1444606 Inline the msgCompSMIMEOverlay.xul

We have our own copies of the the xul overlay files in suite\extensions\smime and as previously in Thunderbird they are not really needed as overlays and can be integrated.

Comment 1

[Frank-Rainer Grahl (:frg)]

Attachment: 1669070-msgReadSMIMEOverlay-2535.patch

[Approval Request Comment]
Regression caused by (bug #): --
User impact if declined: none cleanup only.
Testing completed (on m-c, etc.): 2.53.5
Risk to taking this patch (and alternatives if risky): low
String changes made by this patch: --

Comment 2

[Frank-Rainer Grahl (:frg)]

Attachment: 1669070-msgHdrViewSMIMEOverlay-2535.patch

[Approval Request Comment]
Regression caused by (bug #): --
User impact if declined: none cleanup only.
Testing completed (on m-c, etc.): 2.53.5
Risk to taking this patch (and alternatives if risky): low
String changes made by this patch: --

Comment 3

[Frank-Rainer Grahl (:frg)]

Attachment: 1669070-msgCompSMIMEOverlay-2535.patch

[Approval Request Comment]
Regression caused by (bug #): --
User impact if declined: none cleanup only.
Testing completed (on m-c, etc.): 2.53.5
Risk to taking this patch (and alternatives if risky): low
String changes made by this patch: --

Comment 4

[Ian Neal]

Comment on attachment 9179458 [details] [diff] [review]
1669070-msgReadSMIMEOverlay-2535.patch

>+++ b/suite/mailnews/content/mailWindowOverlay.xul
>+  <statusbarpanel class="statusbarpanel-iconic" id="signed-status"
Nit: one attribute per line, and prefer id is the first one.
>+                  collapsed="true"
>+                  oncommand="showMessageReadSecurityInfo();"/>
>+  <statusbarpanel class="statusbarpanel-iconic" id="encrypted-status"
Nit: one attribute per line, and prefer id is the first one.
>+                  collapsed="true"
>+                  oncommand="showMessageReadSecurityInfo();"/>
>+    <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
Nit: indentation is incorrect here, plus is it worth putting with the other stringbundle lines near the top of the file?

r/a=me with those addressed / answered.

Comment 5

[Ian Neal]

Comment on attachment 9179459 [details] [diff] [review]
1669070-msgHdrViewSMIMEOverlay-2535.patch

>+++ b/suite/mailnews/content/msgHdrViewOverlay.xul
>   </vbox>
> 
>+   <vbox id="smimeBox" collapsed="true">
>+     <spacer flex="1"/>
>+     <image id="signedHdrIcon"
>+            onclick="showMessageReadSecurityInfo();" collapsed="true"/>
Nit: one attribute per line.
>+     <image id="encryptedHdrIcon"
>+            onclick="showMessageReadSecurityInfo();" collapsed="true"/>
Nit: one attribute per line.
>+     <spacer flex="1"/>
>+   </vbox>
>+
Nit: all indentation is 1 too much.
r/a=me with those addressed.

Comment 6

[Ian Neal]

Comment on attachment 9179460 [details] [diff] [review]
1669070-msgCompSMIMEOverlay-2535.patch

>+++ b/suite/mailnews/components/compose/content/messengercompose.xul
>     <stringbundle id="brandBundle" src="chrome://branding/locale/brand.properties"/>
>+    <stringbundle id="bundle_comp_smime"  src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
Nit: two spaces before src, only need one.

>+  <observes element="securityStatus" attribute="crypto" />
>+  <observes element="securityStatus" attribute="signing" />
Nit: no space needed before the />

>+    <statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
Nit: insertbefore no longer needed, also start with id attribute.
>+                    collapsed="true"
>+                    id="signing-status"
>+                    oncommand="showMessageComposeSecurityStatus();"/>
>+    <statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
Nit: insertbefore no longer needed, also start with id attribute.
>+                    collapsed="true"
>+                    id="encryption-status"
>+                    oncommand="showMessageComposeSecurityStatus();"/>

r/a=me with those fixed.

Comment 7

[Frank-Rainer Grahl (:frg)]

Attachment: 1669070-msgReadSMIMEOverlay-V2-2535.patch

NITs addressed. r/a+ from IanN retained.
I reformatted the whole status bar section. Was a mess with half and half. Let me know if you prefer it only piecemeal.
I didn't move the the stringbundle because of TB Bug 1452764 but it seems with our overlay still intact this does not matter.

Comment 8

[Frank-Rainer Grahl (:frg)]

Attachment: 1669070-msgHdrViewSMIMEOverlay-V1_1-2535.patch

NITs addressed. r/a+ from IanN retained.

Comment 9

[Frank-Rainer Grahl (:frg)]

Attachment: 1669070-msgCompSMIMEOverlay-V2-2535.patch

NITs addressed. r/a+ from IanN retained.
I reformatted the whole status bar section here too.

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/c887b1a521f5
Inline the suite msgReadSMIMEOverlay.xul. r=IanN
https://hg.mozilla.org/comm-central/rev/6371f563ee82
Inline the suite msgHdrViewSMIMEOverlay.xul. r=IanN
https://hg.mozilla.org/comm-central/rev/1271024f4494
Inline the suite msgCompSMIMEOverlay.xul. r=IanN

Comment 11

[Frank-Rainer Grahl (:frg)]

Target 2.53.5
https://gitlab.com/seamonkey-project/seamonkey-2.53-comm/-/commit/b0e746d25c7b49fa4c50aa0f244c87c26133af07
Inline the suite msgReadSMIMEOverlay.xul. r=IanN a=IanN
https://gitlab.com/seamonkey-project/seamonkey-2.53-comm/-/commit/8bdb6e1ca7acc4520e36f0f489bb01dbe2365800
Inline the suite msgHdrViewSMIMEOverlay.xul. r=IanN a=IanN
https://gitlab.com/seamonkey-project/seamonkey-2.53-comm/-/commit/c47e8e7cb3584f27d4c509d45cd9730be2731b07
Inline the suite msgCompSMIMEOverlay.xul. r=IanN a=IanN