From 7d200495f66debc5c18aa8840b06cb7cb144192a Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Mon, 21 May 2007 23:32:03 +0000 Subject: [PATCH] Fix Mac bustage. git-svn-id: svn://10.0.0.236/trunk@226760 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/imap/src/nsImapService.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/mailnews/imap/src/nsImapService.cpp b/mozilla/mailnews/imap/src/nsImapService.cpp index a3312d2f7c0..54ef757af3f 100644 --- a/mozilla/mailnews/imap/src/nsImapService.cpp +++ b/mozilla/mailnews/imap/src/nsImapService.cpp @@ -784,8 +784,10 @@ nsImapService::CopyMessages(nsMsgKeyArray *keys, nsIMsgFolder *srcFolder, nsIStr PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder); rv = CreateStartOfImapUrl(uri.get(), getter_AddRefs(imapUrl), folder.get(), aUrlListener, urlSpec, hierarchySeparator); nsImapAction action; - action = (moveMessage) ? nsIImapUrl::nsImapOnlineToOfflineMove : nsIImapUrl::nsImapOnlineToOfflineCopy; - imapUrl->SetCopyState(aMailboxCopy); + if (moveMessage) // don't use ?: syntax here, it seems to break the Mac. + action = nsIImapUrl::nsImapOnlineToOfflineMove; + else + imapUrl->SetCopyState(aMailboxCopy); // now try to display the message rv = FetchMessage(imapUrl, action, folder, imapMessageSink, aMsgWindow, streamSupport, messageIds.get(), PR_FALSE, nsnull, aURL);