1471278 - Port bug 1449686 to TB: Remove most XPCOM special directories as they are unused

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

[Richard Marti (:Paenglab)]

The becky importer needs a special directory which is removed (NS_WIN_DOCUMENTS_DIR).

Comment 1

[Richard Marti (:Paenglab)]

Attachment: special_dir.patch

I hope, becky is the only directory. At least on Windows it builds with this patch.

Comment 2

[Jorg K (CEST = GMT+2)]

Comment on attachment 8987874 [details] [diff] [review]
special_dir.patch

Thanks, sure, this will compile, but it won't work.

M-C removed opening the Windows "documents" directory here:
https://hg.mozilla.org/mozilla-central/rev/221a0435d2dd#l1.139

This function now needs to go into here:
https://dxr.mozilla.org/comm-central/rev/51678c5b0b3edd827c57a70f1c5baf02d44acead/mailnews/import/becky/src/nsBeckyUtils.cpp#39

I'll take care of it.

Comment 3

[Jorg K (CEST = GMT+2)]

Attachment: 1471278-tweak.patch

This will let us compile, but Becky will be broken. We have some tests for Becky, so they may fail now.

Comment 4

[Jorg K (CEST = GMT+2)]

Attachment: 1471278-tweak.patch (v1b)

Tweaked comment.

Comment 5

[Jorg K (CEST = GMT+2)]

https://hg.mozilla.org/comm-central/rev/298f45b92eeac214d20bf31f974fae2cc9483e64
Tweak nsBeckyUtils.cpp so it compiles after removal of documents dir retrieval in bug 1449686. rs=bustage-fix

Comment 6

[Jorg K (CEST = GMT+2)]

Attachment: 1471278-win-docs-cc.patch

Nathan, you can be a C-C reviewer ;-)

Comment 7

[Jorg K (CEST = GMT+2)]

Attachment: 1471278-restore-win-docs.patch

Here's the M-C part. Quite painless.

Comment 8

[Nathan Froyd [:froydnj]]

Comment on attachment 8987949 [details] [diff] [review]
1471278-win-docs-cc.patch

Review of attachment 8987949 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with the changes in moz.build and the #include below.  Your call on whether you want to check AppendNative for success.

::: mailnews/import/becky/src/moz.build
@@ +15,5 @@
>  
>  FINAL_LIBRARY = 'import'
> +
> +LOCAL_INCLUDES += [
> +  '/%s/xpcom/io' % CONFIG['mozreltopsrcdir'],

It looks like SpecialSystemDirectory.h is exported, so you shouldn't need all this.

::: mailnews/import/becky/src/nsBeckyUtils.cpp
@@ +27,5 @@
>  #include "nsIImportMail.h"
>  #include "nsThreadUtils.h"
>  
>  #include "nsBeckyUtils.h"
> +#include "SpecialSystemDirectory.h"  // from xpcom/io

It looks like this header is exported, so the comment is unnecessary.

@@ +41,2 @@
>    NS_ENSURE_SUCCESS(rv, rv);
> +  directory->AppendNative(NS_LITERAL_CSTRING("Becky"));

Check for success, just because?

Comment 9

[Jorg K (CEST = GMT+2)]

Nathan, thanks for the quick turnaround. I assumed SpecialSystemDirectory.h wasn't exported and didn't check :-( - I'll address the issues.

Comment 10

[Jorg K (CEST = GMT+2)]

Attachment: 1471278-restore-win-docs.patch - This one is for M-C

Carrying forward froydnj's r+.
I fixed the commit message which didn't have the correct reviewer abbreviation.

Dear Sheriff, please land the second patch "1471278-restore-win-docs.patch" onto Mozilla's inbound. Thanks.

Comment 11

[Jorg K (CEST = GMT+2)]

Attachment: 1471278-win-docs-cc.patch (v1b)

C-C patch with Nathan's comments addressed.

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/516d30430621
Restore GetSpecialSystemDirectory() for Win_Documents when compiling Thunderbird. r=froydnj

Comment 13

[Dorel Luca [:dluca]]

https://hg.mozilla.org/mozilla-central/rev/516d30430621

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/a7a82010440e
Use GetSpecialSystemDirectory() for Win_Documents. r=froydnj