Attachment 321424 Details for Bug 518603

[patch] mozilla-xulrunner191 patch

fix-startup-notification.patch (text/plain), 1.31 KB, created by Lubos Lunak on 2009-10-07 10:59:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2009-10-07 10:59:56 UTC

Size: 1.31 KB

patch

obsolete

>--- toolkit/xre/nsAppRunner.cpp.sav	2009-07-31 08:30:33.000000000 +0200
>+++ toolkit/xre/nsAppRunner.cpp	2009-10-06 23:40:12.000000000 +0200
>@@ -3173,13 +3173,6 @@ XRE_main(int argc, char* argv[], const n
> 
>         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);
>@@ -3205,6 +3198,13 @@ XRE_main(int argc, char* argv[], const n
>           NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
>           NS_ENSURE_SUCCESS(rv, 1);
> 
>+#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"));

Actions: View | Diff

Attachments on bug 518603: 321424