Closed Bug 1669070 Opened 4 years ago Closed 4 years ago

Remove SMIME overlay files from SeaMonkey

Categories

(SeaMonkey :: MailNews: Composition, task)

Product:
SeaMonkey
Component:
MailNews: Composition
Type:
task

Tracking

(seamonkey2.53+ fixed, seamonkey2.57esr? affected)

Status:
RESOLVED FIXED
Milestone:
seamonkey 2.80
Tracking Flags:
Tracking Status
seamonkey2.53 + fixed
seamonkey2.57esr ? affected

People

(Reporter: frg, Assigned: frg)

References

(Blocks 1 open bug)

Details

(Whiteboard: SM2.53.5)

Attachments

(3 files, 3 obsolete files)

1669070-msgReadSMIMEOverlay-V2-2535.patch
(deleted), patch
frg
: review+
frg
: approval-comm-release+
frg
: approval-comm-esr60+
Details | Diff | Splinter Review
1669070-msgHdrViewSMIMEOverlay-V1_1-2535.patch
(deleted), patch
frg
: review+
frg
: approval-comm-release+
frg
: approval-comm-esr60+
Details | Diff | Splinter Review
1669070-msgCompSMIMEOverlay-V2-2535.patch
(deleted), patch
frg
: review+
frg
: approval-comm-release+
frg
: approval-comm-esr60+
Details | Diff | Splinter Review

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.

Attached patch 1669070-msgReadSMIMEOverlay-2535.patch (obsolete) (deleted) — — Splinter Review

[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: --

Attachment #9179458 - Flags: review?(iann_bugzilla)
Attachment #9179458 - Flags: approval-comm-release?
Attachment #9179458 - Flags: approval-comm-esr60?
Attached patch 1669070-msgHdrViewSMIMEOverlay-2535.patch (obsolete) (deleted) — — Splinter Review

[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: --

Attachment #9179459 - Flags: review?(iann_bugzilla)
Attachment #9179459 - Flags: approval-comm-release?
Attachment #9179459 - Flags: approval-comm-esr60?
Attached patch 1669070-msgCompSMIMEOverlay-2535.patch (obsolete) (deleted) — — Splinter Review

[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: --

Attachment #9179460 - Flags: review?(iann_bugzilla)
Attachment #9179460 - Flags: approval-comm-release?
Attachment #9179460 - Flags: approval-comm-esr60?
Whiteboard: SM2.53.5
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.
Attachment #9179458 - Flags: review?(iann_bugzilla)
Attachment #9179458 - Flags: review+
Attachment #9179458 - Flags: approval-comm-release?
Attachment #9179458 - Flags: approval-comm-release+
Attachment #9179458 - Flags: approval-comm-esr60?
Attachment #9179458 - Flags: approval-comm-esr60+
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.
Attachment #9179459 - Flags: review?(iann_bugzilla)
Attachment #9179459 - Flags: review+
Attachment #9179459 - Flags: approval-comm-release?
Attachment #9179459 - Flags: approval-comm-release+
Attachment #9179459 - Flags: approval-comm-esr60?
Attachment #9179459 - Flags: approval-comm-esr60+
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.
Attachment #9179460 - Flags: review?(iann_bugzilla)
Attachment #9179460 - Flags: review+
Attachment #9179460 - Flags: approval-comm-release?
Attachment #9179460 - Flags: approval-comm-release+
Attachment #9179460 - Flags: approval-comm-esr60?
Attachment #9179460 - Flags: approval-comm-esr60+

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.

Attachment #9179458 - Attachment is obsolete: true
Attachment #9181137 - Flags: review+
Attachment #9181137 - Flags: approval-comm-release+

NITs addressed. r/a+ from IanN retained.

Attachment #9179459 - Attachment is obsolete: true
Attachment #9181139 - Flags: review+
Attachment #9181139 - Flags: approval-comm-release+
Attachment #9181139 - Flags: approval-comm-esr60+
Attachment #9181137 - Flags: approval-comm-esr60+

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

Attachment #9179460 - Attachment is obsolete: true
Attachment #9181141 - Flags: review+
Attachment #9181141 - Flags: approval-comm-release+
Attachment #9181141 - Flags: approval-comm-esr60+

Pushed by frgrahl@gmx.net:
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

Status: ASSIGNED → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → seamonkey 2.80
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: