1332017 - Port bug 1306327 to TB [Build an XPCOM startup API specifically for the Firefox stub which doesn't need the XPCOM glue]

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

[Richard Marti (:Paenglab)]

M-c Moved most of nsBrowserApp.cpp to some glue library (mozglue, probably).

Comment 1

[Richard Marti (:Paenglab)]

Attachment: noXPCOMglue.patch

This fixes the bustage and TB starts here normally. All I tested looks okay.

Comment 2

[Jorg K (CEST = GMT+2)]

Wow, that's a huge patch!

I think the trick is to compare browser\app\nsBrowserApp.cpp with mail\app\nsMailApp.cpp.

The differences are minimal (thanks to Aleth keeping it in sync):

< #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID)
---
> #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID) \
>   && !(defined(XP_LINUX) && defined(MOZ_SANDBOX))
94c95
< #include "../../ipc/contentproc/plugin-container.cpp"
---
> #include "../../mozilla/ipc/contentproc/plugin-container.cpp"
102c103
< #define kDesktopFolder "browser"
---
> #define kDesktopFolder ""
132,134c133,135
<       messageBoxW(nullptr, wide_msg, L"Firefox", MB_OK
<                                                | MB_ICONERROR
<                                                | MB_SETFOREGROUND);
---
>       messageBoxW(nullptr, wide_msg, L"Thunderbird", MB_OK
>                                                    | MB_ICONERROR
>                                                    | MB_SETFOREGROUND);

So I will apply you patch and see that I get the same differences.

Stand by ;-)

Comment 3

[Jorg K (CEST = GMT+2)]

OK, with the new nsBrowserApp.cpp and the patch applied, I now see these differences:

< #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID)
---
> #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID) \
>   && !(defined(XP_LINUX) && defined(MOZ_SANDBOX))
94c95
< #include "../../ipc/contentproc/plugin-container.cpp"
---
> #include "../../mozilla/ipc/contentproc/plugin-container.cpp"
102c103
< #define kDesktopFolder "browser"
---
> #define kDesktopFolder ""
132,134c133,135
<       messageBoxW(nullptr, wide_msg, L"Firefox", MB_OK
<                                                | MB_ICONERROR
<                                                | MB_SETFOREGROUND);
---
>       messageBoxW(nullptr, wide_msg, L"Thunderbird", MB_OK
>                                                    | MB_ICONERROR
>                                                    | MB_SETFOREGROUND);
179c180,181
<   // Allow firefox.exe to launch XULRunner apps via -app <application.ini>
---
>
>   // Allow thunderbird.exe to launch XULRunner apps via -app <application.ini>

Hmm, you changed the comment about XULRunner. Well, OK ;-)
I don't think anything will launch XULRunner, but in a Thunderbird file, the word "thunderbird" is more appropriate.

Review coming up in a second.

Comment 4

[Jorg K (CEST = GMT+2)]

Comment on attachment 8828025 [details] [diff] [review]
noXPCOMglue.patch

Very nice editing work, indeed. And much appreciated.
Richard fixes bustage before it occurs ;-)

You land, right? Please fix the r=jorgk, there is a spurious quote that's not meant to be there in the commit comment.

Comment 5

[Richard Marti (:Paenglab)]

https://hg.mozilla.org/comm-central/rev/79fa2565f18285e492e3e12908488d96f287990b

Comment 6

[Richard Marti (:Paenglab)]

I will look in a follow up bug about the differences.

Comment 7

[Jorg K (CEST = GMT+2)]

I don't understand. The differences are wanted and expected. With the new version we have the same differences, so all is good.

The are:
< #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID)
---
> #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID) \
>   && !(defined(XP_LINUX) && defined(MOZ_SANDBOX))

That's due to different sandboxing in TB.

< #include "../../ipc/contentproc/plugin-container.cpp"
---
> #include "../../mozilla/ipc/contentproc/plugin-container.cpp"

That's due to the different directory structure.

< #define kDesktopFolder "browser"
---
> #define kDesktopFolder ""

No idea :-(

And the remaining ones are about the different name of the app.

So no further action required.

Comment 8

[Richard Marti (:Paenglab)]

Okay, then it's good. On line 28 is a firefox.exe which could be changed to thunderbird.exe. But this could be shortly be removed as it looks it's for XP. :-)

Comment 9

[Jorg K (CEST = GMT+2)]

Of course this needs porting to im/app/nsMain.cpp and suite/app/nsSuiteApp.cpp.
Maybe my comparison technique will be helpful.

Comment 10

[Frank-Rainer Grahl (:frg)]

Thanks. ewong has done it in bug 133217  for SeaMonkey.

> #define kDesktopFolder

FYI. Firefox puts the exe in a separate browser folder called (surprise) browser. I don't think TB does it so you don't need it.

Comment 11

[Jorg K (CEST = GMT+2)]

(In reply to Frank-Rainer Grahl from comment #10)
> Thanks. ewong has done it in bug 133217  for SeaMonkey.
I don't think so ;-( We're far past the million.

Comment 12

[Frank-Rainer Grahl (:frg)]

Sorry cut and paste error: Bug 1332173