From 3f9c1b04d654d839567cae59f2a2bd184ddeab47 Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com" <mozilla.mano%sent.com>
Date: Fri, 7 Oct 2005 18:09:43 +0000
Subject: [PATCH] Bug 311466 - On OS X, open the app in safe-mode if the option
 key is pressed during startup. r=bsmedberg.

---
 toolkit/xre/nsAppRunner.cpp             | 5 +++++
 toolkit/xre/nsCommandLineServiceMac.cpp | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 40cd8a552431..811b125220aa 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -164,6 +164,7 @@
 
 #if defined (XP_MACOSX)
 #include <Processes.h>
+#include <Events.h>
 #endif
 
 extern "C" void ShowOSAlert(const char* aMessage);
@@ -1907,7 +1908,11 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
   ScopedFPHandler handler;
 #endif /* XP_OS2 */
 
+#ifdef XP_MACOSX
+  if (CheckArg("safe-mode") || GetCurrentKeyModifiers() & optionKey)
+#else
   if (CheckArg("safe-mode"))
+#endif
     gSafeMode = PR_TRUE;
 
   // Handle -help and -version command line arguments.
diff --git a/toolkit/xre/nsCommandLineServiceMac.cpp b/toolkit/xre/nsCommandLineServiceMac.cpp
index 2aeead840077..051c68136c52 100644
--- a/toolkit/xre/nsCommandLineServiceMac.cpp
+++ b/toolkit/xre/nsCommandLineServiceMac.cpp
@@ -167,9 +167,6 @@ nsresult nsMacCommandLine::Initialize(int& argc, char**& argv)
       err = ::AEProcessAppleEvent(&anEvent);
     }
   }
-  
-  if (GetCurrentKeyModifiers() & optionKey)
-    AddToCommandLine("-p");
 
   // we've started up now
   mStartedUp = PR_TRUE;