From 728e8cb2f98d3622f6546db91742e3a666e8ef9c Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@fedoraproject.org>
Date: May 13 2009 20:24:12 +0000
Subject: - Fix startup crash when imap server sends list response with trailing

    delimiter

---

diff --git a/thunderbird-imap-startup-crash.patch b/thunderbird-imap-startup-crash.patch
new file mode 100644
index 0000000..c55d82e
--- /dev/null
+++ b/thunderbird-imap-startup-crash.patch
@@ -0,0 +1,20 @@
+
+# HG changeset patch
+# User David Bienvenu <bienvenu@nventure.com>
+# Date 1236181428 28800
+# Node ID 513295ae0230e3d0baa73b1ee98627d4b2f97d24
+# Parent f290d90a853210f29f7b9306abf657dd81f0d6b5
+fix crash on startup when imap server sends list response with trailing delimiter (not /), r/sr=standard8, 480870
+
+--- a/mailnews/imap/src/nsImapIncomingServer.cpp	Wed Mar 04 10:59:11 2009 +0000
++++ b/mailnews/imap/src/nsImapIncomingServer.cpp	Wed Mar 04 07:43:48 2009 -0800
+@@ -1109,7 +1109,7 @@ NS_IMETHODIMP nsImapIncomingServer::Poss
+     return rv;
+ 
+   nsCAutoString dupFolderPath(folderPath);
+-  if (dupFolderPath.Last() == hierarchyDelimiter)
++  if (dupFolderPath.Last() == '/')
+   {
+     dupFolderPath.SetLength(dupFolderPath.Length()-1);
+     // *** this is what we did in 4.x in order to list uw folder only
+
diff --git a/thunderbird.spec b/thunderbird.spec
index 018df3b..bb6570c 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -9,7 +9,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.2.beta2%{?dist}
+Release:        2.3.beta2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,6 +33,8 @@ Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
 Patch3:         xulrunner-elif.patch
 Patch4:         thunderbird-pango.patch
+Patch5:         thunderbird-imap-startup-crash.patch
+
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -87,6 +89,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %patch2 -p1 -b .shared-error
 %patch3 -p0 -b .xulrunner-elif
 %patch4 -p1 -b .pango-fix
+%patch5 -p1 -b .imap-startup-crash
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -298,6 +301,9 @@ fi
 #===============================================================================
 
 %changelog
+* Wed May 13 2009 Christopher Aillon <caillon@redhat.com> - 3.0-2.3
+- Fix startup crash when imap server sends list response with trailing delimiter
+
 * Mon Mar 30 2009 Jan Horak <jhorak@redhat.com> - 3.0-2.2.beta2
 - Fixed open-browser.sh to use xdg-open instead of gnome-open