The default bug view has changed. See this FAQ.

merge junkLog.* files in /mailnews and /mail

RESOLVED FIXED in Thunderbird 16.0

Status

MailNews Core
Filters
--
minor
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: aceman, Assigned: aceman)

Tracking

Trunk
Thunderbird 16.0
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 1 obsolete attachment)

13.26 KB, patch
mconley
: review+
Details | Diff | Splinter Review
(Assignee)

Description

5 years ago
The junkLog.* files in /mailnews/base/content/ and /mail/components/preferences/ look identical. The only difference I see is a string ID that was changed for bug 323159, that was done only in the TB version. But maybe Seamonkey would also like that change.

http://mxr.mozilla.org/comm-central/search?string=junklog.xul&find=&findi=&filter=^[^\0]*%24&hitlimit=&tree=comm-central

http://mxr.mozilla.org/comm-central/search?string=junklog.js&find=&findi=&filter=^[^\0]*%24&hitlimit=&tree=comm-central

From my understanding Seamonkey uses the /mailnews files and Tb uses the /mail files. So I'd try to merge the files and make both TB and SM use the /mailnews version (that will be updated for the string ID change). I assume that should be just some jar.mn touches and using "chrome://messenger/content/junkLog.*" as src in the files referencing those 2 files.

(But wait until bug 760126 lands.)

Comment 1

5 years ago
(In reply to :aceman from comment #0)
> The junkLog.* files in /mailnews/base/content/ and
> /mail/components/preferences/ look identical. The only difference I see is a
> string ID that was changed for bug 323159, that was done only in the TB
> version. But maybe Seamonkey would also like that change.
I see no problem with SeaMonkey having that string change.

Updated

5 years ago
Status: NEW → ASSIGNED
(Assignee)

Comment 2

5 years ago
Thanks, I'll go for it.

Ian, I usually change the status to ASSIGNED (on bugs where I am the assignee) only after I produce any patch :) It helps me keep some order in the bugs.
(Assignee)

Comment 3

5 years ago
Created attachment 631163 [details] [diff] [review]
patch

Ian, please see if Seamonkey is unaffected and only gets the string change.

I can confirm that at least on TB12 both /mailnews and /mail copies of junkLog.* files are shipped in omni.ja. So this should reduce the size of release build of TB by about 2KB (before compression)! :-P
Attachment #631163 - Flags: review?(iann_bugzilla)

Comment 4

5 years ago
Comment on attachment 631163 [details] [diff] [review]
patch

>+++ b/mail/locales/jar.mn
>@@ -143,17 +143,17 @@
>   locale/@AB_CD@/messenger/messengercompose/mailComposeEditorOverlay.dtd (%chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd)
>   locale/@AB_CD@/messenger/preferences/preferences.dtd                  (%chrome/messenger/preferences/preferences.dtd)
>   locale/@AB_CD@/messenger/preferences/general.dtd                      (%chrome/messenger/preferences/general.dtd)
>   locale/@AB_CD@/messenger/preferences/display.dtd                      (%chrome/messenger/preferences/display.dtd)
>   locale/@AB_CD@/messenger/preferences/chat.dtd                         (%chrome/messenger/preferences/chat.dtd)
>   locale/@AB_CD@/messenger/preferences/compose.dtd                      (%chrome/messenger/preferences/compose.dtd)
>   locale/@AB_CD@/messenger/preferences/sendoptions.dtd                  (%chrome/messenger/preferences/sendoptions.dtd)
>   locale/@AB_CD@/messenger/preferences/security.dtd                     (%chrome/messenger/preferences/security.dtd)
>-  locale/@AB_CD@/messenger/preferences/junkLog.dtd                      (%chrome/messenger/preferences/junkLog.dtd)
>+  locale/@AB_CD@/messenger/junkLog.dtd                                  (%chrome/messenger/junkLog.dtd)
You might want to put this earlier in the file.

>+++ b/mailnews/base/content/junkLog.xul
>     <hbox>
>+      <label value="&adaptiveJunkLogInfo.label;"/>
>       <spacer flex="1"/>
>+      <button label="&clearLog.label;" accesskey="&clearLog.accesskey;"
>+              oncommand="clearLog();"/>
Nit: one attribute per line.
>     </hbox>
>     <vbox flex="1">
>       <spacer height="10px"/>
>       <hbox flex="1">
>         <spacer width="10px"/>
>+        <browser id="logView" disablehistory="true" disablesecurity="true"
>+                 src="about:blank" autofind="false" flex="1"/>
Nit: one attribute per line.

r=me with those fixed/addressed
Attachment #631163 - Flags: review?(iann_bugzilla) → review+
(Assignee)

Comment 5

5 years ago
Created attachment 631733 [details] [diff] [review]
patch v2

Thanks Ian.
There should be no UI change in TB (only string change in SM) so no ui-r requested.
Attachment #631163 - Attachment is obsolete: true
Attachment #631733 - Flags: review?(mconley)
Comment on attachment 631733 [details] [diff] [review]
patch v2

Review of attachment 631733 [details] [diff] [review]:
-----------------------------------------------------------------

Looks OK to me. Thanks for the patch!
Attachment #631733 - Flags: review?(mconley) → review+
(Assignee)

Updated

5 years ago
Keywords: checkin-needed
https://hg.mozilla.org/comm-central/rev/47380a5f11f4
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Flags: in-testsuite-
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 16.0
You need to log in before you can comment on or make changes to this bug.