From 9d2cc19a8b07c6ab98c5dabc7c8eda56ee752b9faed0c20dfdbb7c3dbbc0a439 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Thu, 8 Oct 2009 08:46:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=62

---
 MozillaThunderbird.changes         |  6 ----
 MozillaThunderbird.spec            |  6 ++--
 mozilla-startup-notification.patch | 58 ------------------------------
 3 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 mozilla-startup-notification.patch

diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index cab40a9..8342c32 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -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
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index ec8c33e..5daa5a1 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -30,7 +30,7 @@ BuildRequires:  nss-shared-helper-devel
 License:        GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
 %define mainversion 3.0b4
 Version:        %{mainversion}
-Release:        1
+Release:        2
 Summary:        The Stand-Alone Mozilla Mail Component
 Url:            http://www.mozilla.org/products/thunderbird/
 Group:          Productivity/Networking/Email/Clients
@@ -47,7 +47,6 @@ Source9:        enigmail-20090813.tar.bz2
 Source10:       create-tar.sh
 Patch1:         thunderbird-cs-smtpauth.patch
 Patch2:         thunderbird-appname.patch
-Patch3:         mozilla-startup-notification.patch
 Patch4:         mozilla-gtkfilepicker-buttonorder.patch
 Patch5:         tb-develdirs.patch
 Patch7:         mozilla-path_len.patch
@@ -139,7 +138,7 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird.
 
 %package -n enigmail
 Version:        0.96.99
-Release:        1
+Release:        3
 License:        GPL v2 or later ; MPL 1.1
 Summary:        OpenPGP addon for Thunderbird and SeaMonkey
 Group:          Productivity/Networking/Email/Clients
@@ -165,7 +164,6 @@ popd
 %endif
 # xulrunner patches
 pushd mozilla
-%patch3 -p1
 %patch4 -p1
 %patch7 -p1
 %patch9 -p1
diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch
deleted file mode 100644
index b9316bf..0000000
--- a/mozilla-startup-notification.patch
+++ /dev/null
@@ -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");