From b4bd2b1c1a5be644862bb3a46fef821925e4c670 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Jun 21 2010 11:46:56 +0000 Subject: Update to 3.0.5 --- diff --git a/.cvsignore b/.cvsignore index 80fc8ff..07b9bb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -thunderbird-3.0.4.source.tar.bz2 -thunderbird-langpacks-3.0.4-20100330.tar.bz2 +thunderbird-3.0.5.source.tar.bz2 +thunderbird-langpacks-3.0.5-20100621.tar.bz2 diff --git a/sources b/sources index e43d233..98c5895 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bb87ca7e62d5869422137765126798be thunderbird-3.0.4.source.tar.bz2 -5b51715204ff7f0c33dac25e0ba27b16 thunderbird-langpacks-3.0.4-20100330.tar.bz2 +564911289b5d895ba5eaf4b3fbed51e8 thunderbird-3.0.5.source.tar.bz2 +5026297cdd2624f397daa487c1fe7823 thunderbird-langpacks-3.0.5-20100621.tar.bz2 diff --git a/thunderbird-436533.patch b/thunderbird-436533.patch deleted file mode 100644 index fd331de..0000000 --- a/thunderbird-436533.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/mailnews/imap/src/nsImapIncomingServer.cpp b/mailnews/imap/src/nsImapIncomingServer.cpp ---- a/mailnews/imap/src/nsImapIncomingServer.cpp -+++ b/mailnews/imap/src/nsImapIncomingServer.cpp -@@ -2255,35 +2259,39 @@ nsImapIncomingServer::OnStopRunningUrl(n - NS_ENSURE_SUCCESS(rv, rv); - break; - case nsIImapUrl::nsImapDiscoverAllBoxesUrl: - if (NS_SUCCEEDED(exitCode)) - DiscoveryDone(); - break; - case nsIImapUrl::nsImapFolderStatus: - { -- PRInt32 folderCount = m_foldersToStat.Count(); -- nsCOMPtr msgFolder( -- do_QueryInterface(m_foldersToStat[folderCount - 1])); -+ nsCOMPtr msgFolder; -+ nsCOMPtr mailUrl = do_QueryInterface(imapUrl); -+ mailUrl->GetFolder(getter_AddRefs(msgFolder)); - if (msgFolder) - { - nsresult rv; - nsCOMPtr session = - do_GetService(NS_MSGMAILSESSION_CONTRACTID, &rv); - NS_ENSURE_SUCCESS(rv, rv); - PRBool folderOpen; - rv = session->IsFolderOpenInWindow(msgFolder, &folderOpen); - if (NS_SUCCEEDED(rv) && !folderOpen && msgFolder) - msgFolder->SetMsgDatabase(nsnull); -+ nsCOMPtr imapFolder = do_QueryInterface(msgFolder); -+ m_foldersToStat.RemoveObject(imapFolder); - } -- m_foldersToStat.RemoveObjectAt(folderCount - 1); -- // This should be done on a timeout, since we shouldn't start a new url -- // from here. -- if (folderCount > 1) -- m_foldersToStat[folderCount - 2]->UpdateStatus(this, nsnull); -+ // if we get an error running the url, it's better -+ // not to chain the next url. -+ if (NS_FAILED(exitCode)) -+ m_foldersToStat.Clear(); -+ if (m_foldersToStat.Count() > 0) -+ m_foldersToStat[0]->UpdateStatus(this, nsnull); -+ break; - } - default: - break; - } - } - return NS_OK; - } - -@@ -2927,19 +2935,19 @@ nsImapIncomingServer::GetNewMessagesForN - nsCOMPtr prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID); - if(prefBranch) - prefBranch->GetBoolPref("mail.imap.use_status_for_biff", &gUseStatus); - gGotStatusPref = PR_TRUE; - } - if (gUseStatus && !isOpen) - { - nsCOMPtr imapFolder = do_QueryInterface(aFolder); -- if (imapFolder && !isServer) -+ if (imapFolder && !isServer && -+ m_foldersToStat.IndexOf(imapFolder) == -1) - m_foldersToStat.AppendObject(imapFolder); -- //imapFolder->UpdateStatus(this, nsnull /* aWindow - null window will prevent alerts */); - } - else - aFolder->UpdateFolder(aWindow); - } - - // Loop through all subfolders to get new messages for them. - nsCOMPtr enumerator; - nsresult rv = aFolder->GetSubFolders(getter_AddRefs(enumerator)); -@@ -2956,23 +2964,18 @@ nsImapIncomingServer::GetNewMessagesForN - if (!msgFolder) - { - NS_WARNING("Not an nsIMsgFolder"); - continue; - } - GetNewMessagesForNonInboxFolders(msgFolder, aWindow, forceAllFolders, - performingBiff); - } -- -- if (isServer) -- { -- PRInt32 folderCount = m_foldersToStat.Count(); -- if (folderCount > 0) -- m_foldersToStat[folderCount - 1]->UpdateStatus(this, nsnull); -- } -+ if (isServer && m_foldersToStat.Count() > 0) -+ m_foldersToStat[0]->UpdateStatus(this, nsnull); - return NS_OK; - } - - NS_IMETHODIMP - nsImapIncomingServer::GetArbitraryHeaders(nsACString &aResult) - { - nsCOMPtr filterList; - nsresult rv = GetFilterList(nsnull, getter_AddRefs(filterList)); diff --git a/thunderbird.desktop b/thunderbird.desktop index 8bb8b13..1a4bc32 100644 --- a/thunderbird.desktop +++ b/thunderbird.desktop @@ -4,6 +4,7 @@ Name=Thunderbird GenericName=Email Comment=Send and Receive Email Exec=thunderbird +TryExec=thunderbird Icon=thunderbird Terminal=false Type=Application diff --git a/thunderbird.spec b/thunderbird.spec index bf1ac0d..0b0d87d 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -23,8 +23,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 3.0.4 -Release: 3%{?dist} +Version: 3.0.5 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -36,7 +36,7 @@ Group: Applications/Internet Source0: %{tarball} %if %{build_langpacks} # Language package archive is build by RH -Source1: thunderbird-langpacks-%{version}-20100330.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20100621.tar.bz2 %endif # Config file for compilation Source10: thunderbird-mozconfig @@ -61,8 +61,6 @@ Patch0: thunderbird-version.patch Patch1: mozilla-jemalloc.patch # Fix for installation fail when building with dynamic linked libraries Patch2: thunderbird-shared-error.patch -# Fix for crash mozbz#550455, remove when 3.0.5 -Patch3: thunderbird-436533.patch %if %{official_branding} # Required by Mozilla Corporation @@ -152,7 +150,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error -%patch3 -p1 -b .436533 %if %{official_branding} # Required by Mozilla Corporation @@ -434,6 +431,9 @@ fi #=============================================================================== %changelog +* Mon Jun 21 2010 Jan Horak - 3.0.5-1 +- Update to 3.0.5 + * Fri Apr 30 2010 Jan Horak - 3.0.4-3 - Fix for mozbz#550455