Subject: Firefox 3.5 broken startup notification

References:

https://bugzilla.mozilla.org/show_bug.cgi?id=534845

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

--- a/toolkit/xre/nsAppRunner.cpp

+++ b/toolkit/xre/nsAppRunner.cpp

 #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);