rpm/MozillaThunderbird
SHA256
1
0
Fork 0
forked from pool/MozillaThunderbird
Code Pull Requests Activity

fixed startup-notification (bnc#518603)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=58
This commit is contained in:
Wolfgang Rosenauer 2009-10-07 19:41:49 +00:00 committed by Git OBS Bridge
parent e4a6998c27
commit 66473e5bc1
3 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MozillaThunderbird.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org
- fixed startup-notification (bnc#518603)
(mozilla-startup-notification.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org

2
MozillaThunderbird.spec
View File

@ -47,6 +47,7 @@ Source9: enigmail-20090813.tar.bz2
Source10: create-tar.sh Source10: create-tar.sh
Patch1: thunderbird-cs-smtpauth.patch Patch1: thunderbird-cs-smtpauth.patch
Patch2: thunderbird-appname.patch Patch2: thunderbird-appname.patch
Patch3: mozilla-startup-notification.patch
Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch
Patch5: tb-develdirs.patch Patch5: tb-develdirs.patch
Patch7: mozilla-path_len.patch Patch7: mozilla-path_len.patch
@ -164,6 +165,7 @@ popd
%endif %endif
# xulrunner patches # xulrunner patches
pushd mozilla pushd mozilla
%patch3 -p1
%patch4 -p1 %patch4 -p1
%patch7 -p1 %patch7 -p1
%patch9 -p1 %patch9 -p1

58
mozilla-startup-notification.patch Normal file
View File

@ -0,0 +1,58 @@
From: Lubos Lunak <llunak@suse.cz>
Subject: Firefox 3.5 broken startup notification
References:
http://bugzilla.novell.com/show_bug.cgi?id=518603
https://bugzilla.mozilla.org/show_bug.cgi?id=416053
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n
}
dirProvider.DoStartup();
PRBool shuttingDown = PR_FALSE;
appStartup->GetShuttingDown(&shuttingDown);
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);
if (!shuttingDown) {
cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1");
NS_ENSURE_TRUE(cmdLine, 1);
@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n
chromeObserver->Observe(cmdLine, "command-line-startup", nsnull);
}
NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow");
rv = appStartup->CreateHiddenWindow();
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"));
NS_ENSURE_TRUE(em, 1);
ar = CheckArg("install-global-extension", PR_TRUE);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n");