xulrunner-qt/startup-notification.patch

   1 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
   2 --- a/toolkit/xre/nsAppRunner.cpp
   3 +++ b/toolkit/xre/nsAppRunner.cpp
   4 @@ -3281,23 +3281,16 @@ XRE_main(int argc, char* argv[], const n
   5          }
   6          dirProvider.DoStartup();
   7
   8          PRBool shuttingDown = PR_FALSE;
   9          appStartup->GetShuttingDown(&shuttingDown);
  10
  11          nsCOMPtr<nsICommandLineRunner> cmdLine;
  12
  13 -#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
  14 -        nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
  15 -        if (toolkit && !desktopStartupID.IsEmpty()) {
  16 -          toolkit->SetDesktopStartupID(desktopStartupID);
  17 -        }
  18 -#endif
  19 -
  20          nsCOMPtr<nsIFile> workingDir;
  21          rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
  22          NS_ENSURE_SUCCESS(rv, 1);
  23
  24          if (!shuttingDown) {
  25            cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1");
  26            NS_ENSURE_TRUE(cmdLine, 1);
  27
  28 @@ -3315,16 +3308,23 @@ XRE_main(int argc, char* argv[], const n
  29
  30            NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow");
  31            rv = appStartup->CreateHiddenWindow();
  32            NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
  33            NS_ENSURE_SUCCESS(rv, 1);
  34
  35            MOZ_SPLASHSCREEN_UPDATE(50);
  36
  37 +#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
  38 +          nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
  39 +          if (toolkit && !desktopStartupID.IsEmpty()) {
  40 +            toolkit->SetDesktopStartupID(desktopStartupID);
  41 +          }
  42 +#endif
  43 +
  44            // Extension Compatibility Checking and Startup
  45            if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
  46              nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
  47              NS_ENSURE_TRUE(em, 1);
  48
  49              if (upgraded) {
  50                rv = em->CheckForMismatches(&needsRestart);
  51                if (NS_FAILED(rv)) {
  52 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
  53 --- a/toolkit/xre/nsAppRunner.cpp
  54 +++ b/toolkit/xre/nsAppRunner.cpp
  55 @@ -3602,30 +3602,23 @@ XRE_main(int argc, char* argv[], const n
  56  #ifdef XP_MACOSX
  57        if (gBinaryPath) {
  58          static char kEnvVar[MAXPATHLEN];
  59          sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath);
  60          PR_SetEnv(kEnvVar);
  61        }
  62  #endif
  63
  64 -// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/?
  65 -// but the hidden window has been destroyed so toolkit is NULL anyway.
  66 -#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
  67 -      nsGTKToolkit* toolkit = GetGTKToolkit();
  68 -      if (toolkit) {
  69 -        nsCAutoString currentDesktopStartupID;
  70 -        toolkit->GetDesktopStartupID(&currentDesktopStartupID);
  71 -        if (!currentDesktopStartupID.IsEmpty()) {
  72 -          nsCAutoString desktopStartupEnv;
  73 -          desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
  74 -          desktopStartupEnv.Append(currentDesktopStartupID);
  75 -          // Leak it with extreme prejudice!
  76 -          PR_SetEnv(ToNewCString(desktopStartupEnv));
  77 -        }
  78 +#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
  79 +      if (!desktopStartupID.IsEmpty()) {
  80 +        nsCAutoString desktopStartupEnv;
  81 +        desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
  82 +        desktopStartupEnv.Append(desktopStartupID);
  83 +        // Leak it with extreme prejudice!
  84 +        PR_SetEnv(ToNewCString(desktopStartupEnv));
  85        }
  86  #endif
  87
  88  #ifdef MOZ_WIDGET_GTK2
  89        MOZ_gdk_display_close(display);
  90  #endif
  91
  92        rv = LaunchChild(nativeApp, appInitiatedRestart);