Fix build bustage after bug 515051 land

RESOLVED FIXED in Thunderbird 3.1a1

Status

Thunderbird
General
RESOLVED FIXED
8 years ago
8 years ago

People

(Reporter: mayhemer, Assigned: BenB)

Tracking

Trunk
Thunderbird 3.1a1
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 2 obsolete attachments)

(Reporter)

Description

8 years ago
From Ben Bucksch:

FYI, this broke Thunderbird.
http://tinderbox.mozilla.org/showbuilds.cgi?tree=Thunderbird

mailnews/news/src/nsNNTPProtocol.cpp:917: error: no matching function for call
to ‘nsIStreamListenerTee::Init(nsCOMPtr<nsIStreamListener>&,
nsCOMPtr<nsIOutputStream>&)’
../../../mozilla/dist/include/nsIStreamListenerTee.h:55: note: candidates are:
virtual nsresult nsIStreamListenerTee::Init(nsIStreamListener*,
nsIOutputStream*, nsIRequestObserver*)
(Reporter)

Comment 1

8 years ago
Going to fix this immediately.
Assignee: nobody → honzab.moz
Status: NEW → ASSIGNED
(Assignee)

Comment 2

8 years ago
Created attachment 412649 [details] [diff] [review]
Fix v1

Quick fix. Just pass NULL to the new parameter. I don't know whether that is correct, but given that it's |optional|, that should be fine.
Sorry for beating you to it, but I needed a working Thunderbird :).
Attachment #412649 - Flags: review?(honzab.moz)
(Reporter)

Comment 3

8 years ago
Comment on attachment 412649 [details] [diff] [review]
Fix v1

Thanks for the quicker fix. I'm just pulling the tree, it takes time, I do it after a really long time, normally I don't work on comm-central.

Please also fix imap:

http://mxr.mozilla.org/comm-central/source/mailnews/imap/src/nsImapProtocol.cpp#8620
Attachment #412649 - Flags: review?(honzab.moz) → review-
(Reporter)

Comment 4

8 years ago
And yes, to just pass null is absolutely correct. It's enough to take a look into the patch for m-c in bug 515051 ;)
(Assignee)

Comment 5

8 years ago
Created attachment 412652 [details] [diff] [review]
Fix, v2

There was another instance in IMAP.
Attachment #412649 - Attachment is obsolete: true
Attachment #412652 - Flags: review?(honzab.moz)
(Reporter)

Comment 6

8 years ago
Comment on attachment 412652 [details] [diff] [review]
Fix, v2

Thank you!
Attachment #412652 - Flags: review?(honzab.moz) → review+
(Assignee)

Comment 7

8 years ago
Created attachment 412654 [details] [diff] [review]
Fix, v3 [Re-checkin comment 9]

use nsnull instead of NULL
Attachment #412652 - Attachment is obsolete: true
Attachment #412654 - Flags: review?(honzab.moz)
(Reporter)

Updated

8 years ago
Attachment #412654 - Flags: review?(honzab.moz) → review+
(Assignee)

Updated

8 years ago
Blocks: 515051
(Reporter)

Comment 8

8 years ago
Backed out as http://hg.mozilla.org/comm-central/rev/4fc6e66787f5
(Reporter)

Comment 9

8 years ago
Comment on attachment 412654 [details] [diff] [review]
Fix, v3 [Re-checkin comment 9]

http://hg.mozilla.org/comm-central/rev/37c634f852e0
Attachment #412654 - Attachment description: Fix, v3 → Fix, v3 [Re-checkin comment 9]
(Reporter)

Updated

8 years ago
Status: ASSIGNED → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED
(Assignee)

Comment 10

8 years ago
Thanks
Assignee: honzab.moz → ben.bucksch
Target Milestone: --- → Thunderbird 3.1a1
Depends on: 529668
Version: unspecified → Trunk

Comment 11

8 years ago
yeah, so this breaks TB trunk with mozilla 1.9.2 branch, so we're going to need something special for 1.9.2 w/ tb trunk. I see that the original has landed on 1.9.2, in a particular way, so TB may need some #ifdef 1.9.2 branch stuff may be needed. I'll try to fix it.

Comment 12

8 years ago
Created attachment 413481 [details] [diff] [review]
fix tb trunk with 1.9.2 bustage - checked in.
Attachment #413481 - Flags: superreview?(bugzilla)
Attachment #413481 - Flags: review?(honzab.moz)
(In reply to comment #11)
> yeah, so this breaks TB trunk with mozilla 1.9.2 branch, so we're going to need
> something special for 1.9.2 w/ tb trunk. I see that the original has landed on
> 1.9.2, in a particular way, so TB may need some #ifdef 1.9.2 branch stuff may
> be needed. I'll try to fix it.

Yeah I noticed that too, but bug 515051 is scheduled to land on 1.9.2 soon. Honza any idea when this would be? (If we had tinderboxes I'd have fixed it earlier, as we don't I've kinda been ignoring it a bit).
(Reporter)

Comment 14

8 years ago
(In reply to comment #13)
> Yeah I noticed that too, but bug 515051 is scheduled to land on 1.9.2 soon.
> Honza any idea when this would be? (If we had tinderboxes I'd have fixed it
> earlier, as we don't I've kinda been ignoring it a bit).

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/f64a9e7d65f4

There is nothing to land on 1.9.2 left. There is no change to the original interface, that's the problem.
(Reporter)

Comment 15

8 years ago
Comment on attachment 413481 [details] [diff] [review]
fix tb trunk with 1.9.2 bustage - checked in.

>diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp
>-          rv = tee->Init(m_channelListener, out, nsnull);
>+          rv = tee->Init(m_channelListener, out
>+#ifndef MOZILLA_1_9_2_BRANCH
>+        , nsnull
>+#endif
>+          );

Maybe just fix the indention here.

Will this ever get compiled with 1.9.1? If so, then the fix is wrong. 
I see I had to add a new method even to the original interface...

r=honzab
Attachment #413481 - Flags: review?(honzab.moz) → review+

Comment 16

8 years ago
No, this won't ever get checked in to 1.9.1
Attachment #413481 - Flags: superreview?(bugzilla) → superreview+

Updated

8 years ago
Attachment #413481 - Attachment description: fix tb trunk with 1.9.2 bustage → fix tb trunk with 1.9.2 bustage - checked in.
You need to log in before you can comment on or make changes to this bug.