442838 - Unfork <msgCompSecurityInfo.xul>

Status: RESOLVED FIXED

(Thunderbird :: Security, defect)

Description

[Serge Gautherie (:sgautherie)]

*1 js: mailnews/, shared :-)

*2 css + 1 dtd + 1 properties: mail/ and suite/, but otherwise identical :-|
 *Would there be a way to share them too, in mailnews/ ?

*1 xul: mail/ and mailnews/ :-(
 *They are (now) identical, except for |s/#/   -/g| for the license. (same text)

<http://mxr.mozilla.org/mozilla/search?string=msgCompSecurityInfo.xul&find=%2Fsmime%2Fjar%5C.mn%24&filter=%5E%5B%5E%5C0%5D*%24&tree=mozilla>
Do we want to preprocess the mailnews/ file, or keep it as it is ?

Comment 1

[Serge Gautherie (:sgautherie)]

Everyone, ping ? (on my 2 questions)

Comment 2

[David :Bienvenu]

sorry, I'm not clear - can we completely unfork smime?

Comment 3

[Serge Gautherie (:sgautherie)]

(In reply to comment #2)

<http://mxr.mozilla.org/comm-central/find?string=%2Fmail%2Fextensions%2Fsmime%2F>
<http://mxr.mozilla.org/comm-central/find?string=%2Fmailnews%2Fextensions%2Fsmime%2Fresources%2Fcontent%2F>
<http://mxr.mozilla.org/comm-central/find?string=%2Fsuite%2F.*%2Fsmime%2F&tree=comm-central>

> sorry, I'm not clear - can we completely unfork smime?

That would be my goal, but currently blocked by bug 442189 at least:
this is why I filed this for this file only atm.

Comment 4

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

(In reply to comment #3)
> That would be my goal, but currently blocked by bug 442189 at least:
> this is why I filed this for this file only atm.

Adding dependency based on comment #3.

Comment 5

[Serge Gautherie (:sgautherie)]

(In reply to David :Bienvenu from comment #2)
> sorry, I'm not clear - can we completely unfork smime?

(In reply to Gary Kwong [:gkw, :nth10sd] from comment #4)
> Adding dependency based on comment #3.

Unless there is an explicit objection, waiting to do it all at once (would) probably means "never": let's do this part now.

Comment 6

[Serge Gautherie (:sgautherie)]

Attachment: Unfork (TB) <msgCompSecurityInfo.xul> [Checked in: Comment 8]

(In reply to Serge Gautherie (:sgautherie) from comment #0)

> *2 css + 1 dtd + 1 properties: mail/ and suite/, but otherwise identical :-|
>  *Would there be a way to share them too, in mailnews/ ?

.dtd and .properties files are identical:
do we want to share them?
is there a syntax to use in /mail jar.mn to package them from /mailnews?

2 SM + 3 TB css files are identical:
same questions.

> Do we want to preprocess the mailnews/ file, or keep it as it is ?

I default to no preprocessing...

Comment 7

[Mark Banner (:standard8)]

(In reply to Serge Gautherie (:sgautherie) from comment #6)
> > *2 css + 1 dtd + 1 properties: mail/ and suite/, but otherwise identical :-|
> >  *Would there be a way to share them too, in mailnews/ ?
> 
> .dtd and .properties files are identical:
> do we want to share them?
> is there a syntax to use in /mail jar.mn to package them from /mailnews?

The long term solution would be to move all the files into mailnews and set up l10n correctly and share them from there. However, I certainly wouldn't want to do that piecemeal as it just makes things complicated for localisers. Hence I wouldn't want to merge these ones in this patch/bug (and I think there's already a bug out somewhere for merging the files).

Comment 8

[Serge Gautherie (:sgautherie)]

Comment on attachment 574606 [details] [diff] [review]
Unfork (TB) <msgCompSecurityInfo.xul>
[Checked in: Comment 8]

http://hg.mozilla.org/comm-central/rev/478cd65b1e96