1387320 - Port Bug 1322874 to mailnews: Get rid of nsIURI.originCharset

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Edmund Wong (:ewong)]

Getting this bustage:

20:24.98 nsAddbookUrl.cpp
20:24.98 e:/mozstuff/comm/trees/c-c/mailnews/addrbook/src/nsAddbookUrl.cpp(170): error C2039: 'GetOriginCharset': is not a member of 'nsAddbookUrl'
20:24.98 e:\mozstuff\comm\trees\c-c\mailnews\addrbook\src\nsAddbookUrl.h(13): note: see declaration of 'nsAddbookUrl'
20:24.98 e:/mozstuff/comm/trees/c-c/mailnews/addrbook/src/nsAddbookUrl.cpp(172): error C2065: 'm_baseURL': undeclared identifier
20:24.98 e:/mozstuff/comm/trees/c-c/mailnews/addrbook/src/nsAddbookUrl.cpp(172): error C2227: left of '->GetOriginCharset' must point to class/struct/union/generic type
20:24.98 e:/mozstuff/comm/trees/c-c/mailnews/addrbook/src/nsAddbookUrl.cpp(172): note: type is 'unknown-type'
20:24.99 e:/mozstuff/comm/trees/c-c/mozilla/config/rules.mk:1050: recipe for target 'nsAddbookUrl.obj' failed
20:24.99 mozmake.EXE[4]: *** [nsAddbookUrl.obj] Error 2
20:24.99 e:/mozstuff/comm/trees/c-c/mozilla/config/recurse.mk:73: recipe for target 'mailnews/addrbook/src/target' failed
20:24.99 mozmake.EXE[3]: *** [mailnews/addrbook/src/target] Error 2
20:24.99 mozmake.EXE[3]: *** Waiting for unfinished jobs....

Comment 1

[Jorg K (CEST = GMT+2)]

https://hg.mozilla.org/mozilla-central/rev/8ff32bdb356d

Comment 2

[Jorg K (CEST = GMT+2)]

Attachment: 1387320-originCharset.patch (v1)

This should compile, but there are more changes necessary:

Services.io.newURI() lost the second charset parameter, which we use in
editor/ui/composer/content/ComposerCommands.js
editor/ui/composer/content/editorUtilities.js

Comment 3

[Jorg K (CEST = GMT+2)]

Masatoshi-san, should we remove the charset here?
https://dxr.mozilla.org/comm-central/source/editor/ui/composer/content/ComposerCommands.js#823 (and more in that file)
https://dxr.mozilla.org/comm-central/source/editor/ui/composer/content/editorUtilities.js#540 (and more in that file)

nsIIOService.newURI() still takes the argument.

Comment 4

[Masatoshi Kimura [:emk]]

The second parameter of nsIIOService.newURI() still has an effect. Please do not remove them as long as the charset is easily available.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/6ee221481c59
Port bug 1322874 to mailnews: Remove nsIURI.originCharset, implement SetQueryWithEncoding(). rs=bustage-fix

Comment 6

[Jorg K (CEST = GMT+2)]

Attachment: 1387320-originCharset.patch (v2).

Comment 7

[Jorg K (CEST = GMT+2)]

(In reply to Masatoshi Kimura [:emk] from comment #4)
> The second parameter of nsIIOService.newURI() still has an effect. Please do
> not remove them as long as the charset is easily available.
OK, I didn't ;-)