Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 07:34:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 178440 - Mach-0 build ignores startup prefs. r=sdagley/sr=sfraser

Browse Source
This commit is contained in:
ccarlen%netscape.com 2002-11-06 15:35:57 +00:00
parent 96218c8ecc
commit 7b9495ff32
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpfe/bootstrap/Makefile.in
View File

@ -160,6 +160,10 @@ CPPSRCS += nsNativeAppSupportBase.cpp
RESFILE = splashos2.res
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
LIBS += $(TK_LIBS)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
SPLASH_XPM = $(srcdir)/splash.xpm
CPPSRCS += nsNativeAppSupportGtk.cpp \

27
xpfe/bootstrap/nsAppRunner.cpp
View File

@ -108,6 +108,10 @@
#include <malloc.h>
#endif
#if defined (XP_MACOSX)
#include <Processes.h>
#endif
#include "nsITimelineService.h"
#if defined(DEBUG_pra)
@ -1463,12 +1467,27 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
// if we had no command line arguments, argc == 1.
PRBool windowOpened = PR_FALSE;
#ifdef XP_MAC
PRBool defaultStartup;
#if defined(XP_MAC)
// if we do no command line args on the mac, it says argc is 0, and not 1
rv = DoCommandLines(cmdLineArgs, ((argc == 1) || (argc == 0)), &windowOpened);
defaultStartup = ((argc == 1) || (argc == 0));
#elif defined(XP_MACOSX)
defaultStartup = (argc == 1);
// On OSX, we get passed two args if double-clicked from the Finder.
// The second is our PSN. Check for this and consider it to be default.
if (argc == 2) {
ProcessSerialNumber ourPSN;
if (::MacGetCurrentProcess(&ourPSN) == noErr) {
char argBuf[64];
sprintf(argBuf, "-psn_%ld_%ld", ourPSN.highLongOfPSN, ourPSN.lowLongOfPSN);
if (!strcmp(argBuf, argv[1]))
defaultStartup = PR_TRUE;
}
}
#else
rv = DoCommandLines(cmdLineArgs, (argc == 1), &windowOpened);
#endif /* XP_MAC */
defaultStartup = (argc == 1);
#endif
rv = DoCommandLines(cmdLineArgs, defaultStartup, &windowOpened);
if (NS_FAILED(rv))
{
NS_WARNING("failed to process command line");