This commit is contained in:
parent
66473e5bc1
commit
9d2cc19a8b
@ -1,9 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
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
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ BuildRequires: nss-shared-helper-devel
|
|||||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
|
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
|
||||||
%define mainversion 3.0b4
|
%define mainversion 3.0b4
|
||||||
Version: %{mainversion}
|
Version: %{mainversion}
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: The Stand-Alone Mozilla Mail Component
|
Summary: The Stand-Alone Mozilla Mail Component
|
||||||
Url: http://www.mozilla.org/products/thunderbird/
|
Url: http://www.mozilla.org/products/thunderbird/
|
||||||
Group: Productivity/Networking/Email/Clients
|
Group: Productivity/Networking/Email/Clients
|
||||||
@ -47,7 +47,6 @@ 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
|
||||||
@ -139,7 +138,7 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird.
|
|||||||
|
|
||||||
%package -n enigmail
|
%package -n enigmail
|
||||||
Version: 0.96.99
|
Version: 0.96.99
|
||||||
Release: 1
|
Release: 3
|
||||||
License: GPL v2 or later ; MPL 1.1
|
License: GPL v2 or later ; MPL 1.1
|
||||||
Summary: OpenPGP addon for Thunderbird and SeaMonkey
|
Summary: OpenPGP addon for Thunderbird and SeaMonkey
|
||||||
Group: Productivity/Networking/Email/Clients
|
Group: Productivity/Networking/Email/Clients
|
||||||
@ -165,7 +164,6 @@ 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
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
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");
|
|
Loading…
Reference in New Issue
Block a user