332362 - Correct misuse of ifdefs in /mailnews

Status: RESOLVED FIXED

(MailNews Core :: Backend, defect)

Description

[Mark Banner (:standard8)]

There are various ifdefs in /mailnews where the wrong one has been used. SeaMonkey needs them correcting in preparation for building it with MOZ_XUL_APP=1.

Comment 1

[Mark Banner (:standard8)]

Attachment: Correct jar.mn files (checked in)

Corrects ifndef MOZ_XUL_APP to ifdef MOZ_SUITE in jar.mn files under /mailnews. Of course, when these move to /suite then the ifdefs will be redundant, but in the meantime we need this.

The mailnews/jar.mn is covered in bug 330053, but I'd missed these ones when I did that patch.

Comment 2

[Mark Banner (:standard8)]

Attachment: Part 2. SeaMonkey would like to have PalmSync as an extension as well (checked in)

SeaMonkey would also like to be able to use palmsync as a full extension (when it becomes a full xul app) - change the ifdefs and add SeaMonkey into the install.rdf.

Comment 3

[Mark Banner (:standard8)]

Attachment: Part 3. Correct MOZ_THUNDERBIRD to MOZ_XUL_APP in nsMessengerWinIntegration (checked in)

This changes MOZ_THUNDERBIRD to MOZ_XUL_APP for some of the ifdefs in nsMessengerWinIntegration - the ones I've changed it for are where it is picking up the newer toolkit interfaces which SeaMonkey hopes to pick up soon.

Comment 4

[Robert Kaiser]

Comment on attachment 216836 [details] [diff] [review]
Correct jar.mn files (checked in)

looks good to me :)

Comment 5

[[e-mail]]

Comment on attachment 216838 [details] [diff] [review]
Part 3. Correct MOZ_THUNDERBIRD to MOZ_XUL_APP in nsMessengerWinIntegration (checked in)

> #ifdef MOZ_STATIC_BUILD
> #define MAIL_DLL_NAME NULL
>-#else
>+#elif defined(MOZ_STATIC_MAIL_BUILD)
> #define MAIL_DLL_NAME "mail.dll"
>-#endif
> #else
> #define MAIL_DLL_NAME "msgbase.dll"
> #endif
I think I'd prefer
#ifdef MOZ_STATIC_BUILD
#define MAIL_DLL_NAME NULL
#else
#ifdef MOZ_STATIC_MAIL_BUILD
#define MAIL_DLL_NAME "mail.dll"
#else
#define MAIL_DLL_NAME "msgbase.dll"
#endif
#endif

Comment 6

[Mark Banner (:standard8)]

Comment on attachment 216838 [details] [diff] [review]
Part 3. Correct MOZ_THUNDERBIRD to MOZ_XUL_APP in nsMessengerWinIntegration (checked in)

Checked in with Neil's comments addressed.

Comment 7

[Mark Banner (:standard8)]

Attachment: Part 4. Two more corrections (checked in).

Two more corrections to ifdefs I've just found.

Comment 8

[Mark Banner (:standard8)]

Ok, I think all the misuse cases are fixed. We can always re-open if I or anyone else finds any more.