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

RESOLVED FIXED

Status

MailNews Core
Build Config
RESOLVED FIXED
11 months ago
11 months ago

People

(Reporter: ewong, Assigned: Jorg K (GMT+2))

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Reporter)

Description

11 months ago
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....
(Assignee)

Comment 1

11 months ago
https://hg.mozilla.org/mozilla-central/rev/8ff32bdb356d
Assignee: nobody → jorgk
Status: NEW → ASSIGNED
Summary: GetOriginCharset is not a member of nsAddbookUrl → Port Bug 1322874 to mailnews: Get rid of nsIURI.originCharset
(Assignee)

Comment 2

11 months ago
Created attachment 8893686 [details] [diff] [review]
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
(Assignee)

Comment 3

11 months ago
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.
Flags: needinfo?(VYV03354)

Comment 4

11 months ago
The second parameter of nsIIOService.newURI() still has an effect. Please do not remove them as long as the charset is easily available.
Flags: needinfo?(VYV03354)

Comment 5

11 months ago
Pushed by mozilla@jorgk.com:
https://hg.mozilla.org/comm-central/rev/6ee221481c59
Port bug 1322874 to mailnews: Remove nsIURI.originCharset, implement SetQueryWithEncoding(). rs=bustage-fix
Status: ASSIGNED → RESOLVED
Last Resolved: 11 months ago
Resolution: --- → FIXED
(Assignee)

Comment 6

11 months ago
Created attachment 8893725 [details] [diff] [review]
1387320-originCharset.patch (v2).
Attachment #8893686 - Attachment is obsolete: true
(Assignee)

Comment 7

11 months ago
(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 ;-)
You need to log in before you can comment on or make changes to this bug.