From e3c21a8456cf86bf955262b71af2bfe4afd25ccc Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xssn.at>
Date: Sun, 22 Aug 2010 19:33:54 +0200
Subject: mass commit everything

Signed-off-by: Florian Pritz <bluewind@xssn.at>
---
 xulrunner-qt/startup-notification.patch | 92 +++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 xulrunner-qt/startup-notification.patch

(limited to 'xulrunner-qt/startup-notification.patch')

diff --git a/xulrunner-qt/startup-notification.patch b/xulrunner-qt/startup-notification.patch
new file mode 100644
index 0000000..a3f2758
--- /dev/null
+++ b/xulrunner-qt/startup-notification.patch
@@ -0,0 +1,92 @@
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3281,23 +3281,16 @@ XRE_main(int argc, char* argv[], const n
+         }
+         dirProvider.DoStartup();
+ 
+         PRBool shuttingDown = PR_FALSE;
+         appStartup->GetShuttingDown(&shuttingDown);
+ 
+         nsCOMPtr<nsICommandLineRunner> cmdLine;
+ 
+-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
+-        nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
+-        if (toolkit && !desktopStartupID.IsEmpty()) {
+-          toolkit->SetDesktopStartupID(desktopStartupID);
+-        }
+-#endif
+-
+         nsCOMPtr<nsIFile> workingDir;
+         rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
+         NS_ENSURE_SUCCESS(rv, 1);
+ 
+         if (!shuttingDown) {
+           cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1");
+           NS_ENSURE_TRUE(cmdLine, 1);
+ 
+@@ -3315,16 +3308,23 @@ XRE_main(int argc, char* argv[], const n
+ 
+           NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow");
+           rv = appStartup->CreateHiddenWindow();
+           NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
+           NS_ENSURE_SUCCESS(rv, 1);
+ 
+           MOZ_SPLASHSCREEN_UPDATE(50);
+ 
++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
++          nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
++          if (toolkit && !desktopStartupID.IsEmpty()) {
++            toolkit->SetDesktopStartupID(desktopStartupID);
++          }
++#endif
++
+           // Extension Compatibility Checking and Startup
+           if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
+             nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
+             NS_ENSURE_TRUE(em, 1);
+ 
+             if (upgraded) {
+               rv = em->CheckForMismatches(&needsRestart);
+               if (NS_FAILED(rv)) {
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3602,30 +3602,23 @@ XRE_main(int argc, char* argv[], const n
+ #ifdef XP_MACOSX
+       if (gBinaryPath) {
+         static char kEnvVar[MAXPATHLEN];
+         sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath);
+         PR_SetEnv(kEnvVar);
+       }
+ #endif
+ 
+-// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/?
+-// but the hidden window has been destroyed so toolkit is NULL anyway.
+-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
+-      nsGTKToolkit* toolkit = GetGTKToolkit();
+-      if (toolkit) {
+-        nsCAutoString currentDesktopStartupID;
+-        toolkit->GetDesktopStartupID(&currentDesktopStartupID);
+-        if (!currentDesktopStartupID.IsEmpty()) {
+-          nsCAutoString desktopStartupEnv;
+-          desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
+-          desktopStartupEnv.Append(currentDesktopStartupID);
+-          // Leak it with extreme prejudice!
+-          PR_SetEnv(ToNewCString(desktopStartupEnv));
+-        }
++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
++      if (!desktopStartupID.IsEmpty()) {
++        nsCAutoString desktopStartupEnv;
++        desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
++        desktopStartupEnv.Append(desktopStartupID);
++        // Leak it with extreme prejudice!
++        PR_SetEnv(ToNewCString(desktopStartupEnv));
+       }
+ #endif
+ 
+ #ifdef MOZ_WIDGET_GTK2
+       MOZ_gdk_display_close(display);
+ #endif
+ 
+       rv = LaunchChild(nativeApp, appInitiatedRestart);
-- 
cgit v1.2.3-24-g4f1b