8
|
1 |
From: Lubos Lunak <llunak@suse.cz>
|
|
2 |
Subject: Firefox 3.5 broken startup notification
|
|
3 |
References:
|
|
4 |
http://bugzilla.novell.com/show_bug.cgi?id=518603
|
|
5 |
https://bugzilla.mozilla.org/show_bug.cgi?id=416053
|
|
6 |
|
1
|
7 |
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
|
|
8 |
--- a/toolkit/xre/nsAppRunner.cpp
|
|
9 |
+++ b/toolkit/xre/nsAppRunner.cpp
|
|
10 |
@@ -3342,23 +3342,16 @@ XRE_main(int argc, char* argv[], const n
|
|
11 |
}
|
|
12 |
dirProvider.DoStartup();
|
|
13 |
|
|
14 |
PRBool shuttingDown = PR_FALSE;
|
|
15 |
appStartup->GetShuttingDown(&shuttingDown);
|
|
16 |
|
|
17 |
nsCOMPtr<nsICommandLineRunner> cmdLine;
|
|
18 |
|
|
19 |
-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
|
|
20 |
- nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
|
|
21 |
- if (toolkit && !desktopStartupID.IsEmpty()) {
|
|
22 |
- toolkit->SetDesktopStartupID(desktopStartupID);
|
|
23 |
- }
|
|
24 |
-#endif
|
|
25 |
-
|
|
26 |
nsCOMPtr<nsIFile> workingDir;
|
|
27 |
rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
|
|
28 |
NS_ENSURE_SUCCESS(rv, 1);
|
|
29 |
|
|
30 |
if (!shuttingDown) {
|
|
31 |
cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1");
|
|
32 |
NS_ENSURE_TRUE(cmdLine, 1);
|
|
33 |
|
|
34 |
@@ -3376,16 +3369,23 @@ XRE_main(int argc, char* argv[], const n
|
|
35 |
|
|
36 |
NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow");
|
|
37 |
rv = appStartup->CreateHiddenWindow();
|
|
38 |
NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
|
|
39 |
NS_ENSURE_SUCCESS(rv, 1);
|
|
40 |
|
|
41 |
MOZ_SPLASHSCREEN_UPDATE(50);
|
|
42 |
|
|
43 |
+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
|
|
44 |
+ nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
|
|
45 |
+ if (toolkit && !desktopStartupID.IsEmpty()) {
|
|
46 |
+ toolkit->SetDesktopStartupID(desktopStartupID);
|
|
47 |
+ }
|
|
48 |
+#endif
|
|
49 |
+
|
|
50 |
// Extension Compatibility Checking and Startup
|
|
51 |
if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
|
|
52 |
nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
|
|
53 |
NS_ENSURE_TRUE(em, 1);
|
|
54 |
|
|
55 |
if (upgraded) {
|
|
56 |
rv = em->CheckForMismatches(&needsRestart);
|
|
57 |
if (NS_FAILED(rv)) {
|