Closed Bug 521293 Opened 15 years ago Closed 14 years ago

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


(MailNews Core :: Build Config, defect)

Not set


(Not tracked)

Thunderbird 3.1a1


(Reporter: sgautherie, Assigned: sgautherie)



(Keywords: fixed-seamonkey2.0.1)


(3 files, 1 obsolete file)

      No description provided.
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).
Ever confirmed: true
Depends on: 522649
Depends on: 522229
Attached patch (Bv1-SM) Update SeaMonkey (obsolete) — Splinter Review
Attachment #407947 - Flags: review?(kairo)
Attachment #407946 - Flags: superreview?(bugzilla)
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 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
> #ifndef MOZILLA_1_9_1_BRANCH
> res/broken-image.gif
> #ifndef MOZILLA_1_9_2_BRANCH
> res/
> res/
> #endif
> #endif
> res/cmessage.txt
>+#ifndef MOZILLA_1_9_2_BRANCH
> #ifndef MOZILLA_1_9_1_BRANCH
> res/loading-image.gif
> #ifndef MOZILLA_1_9_2_BRANCH
> res/
> res/
> #endif
> #endif
This is just too confusing. Can we clean up the existing 1_9_1 stuff first?
Comment on attachment 407947 [details] [diff] [review]
(Bv1-SM) Update SeaMonkey

>+#ifdef MOZILLA_1_9_2_BRANCH
> const gViewSourceCSS = 'resource://gre/res/viewsource.css';
>+const gViewSourceCSS = 'resource://gre-resources/viewsource.css';
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 ;-)
Just drop this into a suitable
#ifdef MOZILLA_1_9_2_BRANCH
% resource gre-resources resource://gre/res/
Depends on: 524216
(In reply to comment #7)
> % resource gre-resources resource://gre/res/

I filed bug 524216.
Blocks: 523820
Attachment #407946 - Flags: superreview?(bugzilla)
Attachment #407946 - Flags: superreview+
Attachment #407946 - Flags: review?(bugzilla)
Attachment #407946 - Flags: review+
Comment on attachment 407946 [details] [diff] [review]
(Av1) Update MailNews Core
[Checkin: See comment 9]
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]
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 →
Attachment #407947 - Attachment is obsolete: true
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.
Attachment #411355 - Flags: review?(neil) → review+
Comment on attachment 411355 [details] [diff] [review]
(Bv1a-SM) Update SeaMonkey
[Checkin: Comment 12]
Attachment #411355 - Attachment description: (Bv1a-SM) Update SeaMonkey → (Bv1a-SM) Update SeaMonkey [Checkin: Comment 12]
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?
Attachment #412209 - Flags: review?(neil) → review+
Attachment #412209 - Flags: approval-seamonkey2.0.1? → approval-seamonkey2.0.1+
Comment on attachment 412209 [details] [diff] [review]
(Cv1-SM-191) "Unfork" (and fix) pageInfo.xul
[Checkin: Comment 14]
Attachment #412209 - Attachment description: (Cv1-SM-191) "Unfork" (and fix) pageInfo.xul → (Cv1-SM-191) "Unfork" (and fix) pageInfo.xul [Checkin: Comment 14]
Depends on: 532122
Bug 530010 is doing TB part...
I filed bug 532122 about "Calendar".
Closed: 14 years ago
Depends on: 530010
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 3.1a1
Is this fixed-seamonkey2.0.1 then? If so, we should add that keyword...
(In reply to comment #16)

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