The default bug view has changed. See this FAQ.

Port |Bug 515777 - move css files, hiddenWindow.html to jar| to comm-central (apps)

RESOLVED FIXED in Thunderbird 3.1a1

Status

MailNews Core
Build Config
RESOLVED FIXED
8 years ago
7 years ago

People

(Reporter: sgautherie, Assigned: sgautherie)

Tracking

({fixed-seamonkey2.0.1})

Trunk
Thunderbird 3.1a1
fixed-seamonkey2.0.1
Dependency tree / graph
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(3 attachments, 1 obsolete attachment)

Comment hidden (empty)
(Assignee)

Comment 1

8 years ago
This is needed at least to fix packaging warnings like
{
Warning: package error or possible missing or unnecessary file: bin/res/viewsource.css (packages, 386).
}
Status: UNCONFIRMED → NEW
Ever confirmed: true
(Assignee)

Updated

8 years ago
Depends on: 522649
(Assignee)

Updated

8 years ago
Depends on: 522229
(Assignee)

Comment 2

8 years ago
Created attachment 407946 [details] [diff] [review]
(Av1) Update MailNews Core
[Checkin: See comment 9]
Attachment #407946 - Flags: review?(bugzilla)
(Assignee)

Comment 3

8 years ago
Created attachment 407947 [details] [diff] [review]
(Bv1-SM) Update SeaMonkey
Attachment #407947 - Flags: review?(kairo)
(Assignee)

Updated

8 years ago
Attachment #407946 - Flags: superreview?(bugzilla)

Comment 4

8 years ago
Comment on attachment 407947 [details] [diff] [review]
(Bv1-SM) Update SeaMonkey

Passing this off the Neil, don't want to be blamed for reviewing a change that makes us preprocess a .js file ;-)
Attachment #407947 - Flags: review?(kairo) → review?(neil)

Comment 5

8 years ago
Comment on attachment 407947 [details] [diff] [review]
(Bv1-SM) Update SeaMonkey

>diff --git a/suite/browser/pageinfo/pageInfo.xul b/suite/browser/pageinfo/pageInfo.xul
>-#ifdef MOZILLA_1_9_1_BRANCH
At least we can unfork this on branch now ;-)

> #ifndef MOZILLA_1_9_1_BRANCH
> components/nsPostUpdateWin.js
> #endif
> #else
> xpicleanup
> #endif
>+#ifndef MOZILLA_1_9_2_BRANCH
>+res/arrow.gif
>+res/arrowd.gif
>+#endif
> #ifndef MOZILLA_1_9_1_BRANCH
> res/broken-image.gif
> #ifndef MOZILLA_1_9_2_BRANCH
>+res/broken-image.png
> res/charsetalias.properties
> res/charsetData.properties
> #endif
> #endif
> res/cmessage.txt
>+#ifndef MOZILLA_1_9_2_BRANCH
>+res/forms.css
>+res/hiddenWindow.html
>+res/html.css
>+#endif
> #ifndef MOZILLA_1_9_1_BRANCH
> res/loading-image.gif
> #ifndef MOZILLA_1_9_2_BRANCH
>+res/loading-image.png
>+res/mathml.css
>+res/quirk.css
>+res/ua.css
> res/unixcharset.properties
>+res/viewsource.css
> res/wincharset.properties
> #endif
> #endif
This is just too confusing. Can we clean up the existing 1_9_1 stuff first?

Comment 6

8 years ago
Comment on attachment 407947 [details] [diff] [review]
(Bv1-SM) Update SeaMonkey

>+#ifdef MOZILLA_1_9_2_BRANCH
> const gViewSourceCSS = 'resource://gre/res/viewsource.css';
>+#else
>+const gViewSourceCSS = 'resource://gre-resources/viewsource.css';
>+#endif
gre-resources doesn't exist on 1_9_2 at all, right? I wonder whether there's a way of mapping it to gre/res ;-)

Comment 7

8 years ago
Just drop this into a suitable jar.mn:
#ifdef MOZILLA_1_9_2_BRANCH
% resource gre-resources resource://gre/res/
#endif
(Assignee)

Updated

8 years ago
Depends on: 524216
(Assignee)

Comment 8

8 years ago
(In reply to comment #7)
> % resource gre-resources resource://gre/res/

I filed bug 524216.
(Assignee)

Updated

8 years ago
Blocks: 523820
Attachment #407946 - Flags: superreview?(bugzilla)
Attachment #407946 - Flags: superreview+
Attachment #407946 - Flags: review?(bugzilla)
Attachment #407946 - Flags: review+
(Assignee)

Comment 9

8 years ago
Comment on attachment 407946 [details] [diff] [review]
(Av1) Update MailNews Core
[Checkin: See comment 9]


http://hg.mozilla.org/comm-central/rev/742a93026723
Av1, with unified m-1.9.2/m-c code only :-)
Attachment #407946 - Attachment description: (Av1) Update MailNews Core → (Av1) Update MailNews Core [Checkin: See comment 9]
(Assignee)

Comment 10

8 years ago
Created attachment 411355 [details] [diff] [review]
(Bv1a-SM) Update SeaMonkey
[Checkin: Comment 12]

Bv1-SM, with comment 5 and comment 6 suggestion(s).

Please, double-check pageInfo.xul which used '/res' and not 'gre/res'.
(I also wants to know if that needs fixing on c-1.9.1 too!)
Assignee: nobody → sgautherie.bz
Attachment #407947 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #411355 - Flags: review?(neil)
Attachment #407947 - Flags: review?(neil)
(In reply to comment #10)
> Please, double-check pageInfo.xul which used '/res' and not 'gre/res'.
> (I also wants to know if that needs fixing on c-1.9.1 too!)
resource:/// points to the location of seamonkey.exe
resource://gre/ points to the location of separate xulrunner (if any)
So pageInfo.xul is broken on xulrunner builds.

Updated

8 years ago
Attachment #411355 - Flags: review?(neil) → review+
(Assignee)

Comment 12

8 years ago
Comment on attachment 411355 [details] [diff] [review]
(Bv1a-SM) Update SeaMonkey
[Checkin: Comment 12]


http://hg.mozilla.org/comm-central/rev/f0720e6edac8
Attachment #411355 - Attachment description: (Bv1a-SM) Update SeaMonkey → (Bv1a-SM) Update SeaMonkey [Checkin: Comment 12]
(Assignee)

Comment 13

8 years ago
Created attachment 412209 [details] [diff] [review]
(Cv1-SM-191) "Unfork" (and fix) pageInfo.xul
[Checkin: Comment 14]

Unforking, per your comment 5.
Fixing, per your comment 11, as I understood it. (Please, double-check.)
Attachment #412209 - Flags: review?(neil)
Attachment #412209 - Flags: approval-seamonkey2.0.1?

Updated

8 years ago
Attachment #412209 - Flags: review?(neil) → review+

Updated

7 years ago
Attachment #412209 - Flags: approval-seamonkey2.0.1? → approval-seamonkey2.0.1+
(Assignee)

Comment 14

7 years ago
Comment on attachment 412209 [details] [diff] [review]
(Cv1-SM-191) "Unfork" (and fix) pageInfo.xul
[Checkin: Comment 14]


http://hg.mozilla.org/releases/comm-1.9.1/rev/98bdec50ab29
Attachment #412209 - Attachment description: (Cv1-SM-191) "Unfork" (and fix) pageInfo.xul → (Cv1-SM-191) "Unfork" (and fix) pageInfo.xul [Checkin: Comment 14]
(Assignee)

Updated

7 years ago
Depends on: 532122
(Assignee)

Comment 15

7 years ago
Bug 530010 is doing TB part...
I filed bug 532122 about "Calendar".
Status: ASSIGNED → RESOLVED
Last Resolved: 7 years ago
Depends on: 530010
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 3.1a1

Comment 16

7 years ago
Is this fixed-seamonkey2.0.1 then? If so, we should add that keyword...
(Assignee)

Comment 17

7 years ago
(In reply to comment #16)

Yes: I forgot to set it on this bug.
Keywords: fixed-seamonkey2.0.1
You need to log in before you can comment on or make changes to this bug.