|
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 @@ -3342,23 +3342,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 @@ -3376,16 +3369,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)) { |