From d4116c40ff3954d9dfefb4b9ed7a41a6484c0b1c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Jun 2012 19:40:14 +0200 Subject: Enigmail 1.4.2 for Thunderbird 13.0 --- mozilla-733867-x.patch | 265 ------------------------------------------------- 1 file changed, 265 deletions(-) delete mode 100644 mozilla-733867-x.patch (limited to 'mozilla-733867-x.patch') diff --git a/mozilla-733867-x.patch b/mozilla-733867-x.patch deleted file mode 100644 index 92116dc..0000000 --- a/mozilla-733867-x.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp ---- comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-04-21 00:32:39.000000000 +0200 -+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 10:51:32.343536178 +0200 -@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV - PL_strcat(encoding, "{"); - lengthStr.AppendInt((PRInt32) strlen(value)); - PL_strcat(encoding, lengthStr.get()); -- PL_strcat(encoding, "}"CRLF); -+ PL_strcat(encoding, "}" CRLF); - PL_strcat(encoding, value); - return NS_OK; - } -diff -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp ---- comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-04-21 00:32:39.000000000 +0200 -+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 10:51:33.208535909 +0200 -@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns - } - } - } --#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK -+#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK - - // if status offset isn't in the first block, this code won't work. There's no good reason - // for the status offset not to be at the beginning of the message anyway. -@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila - // check if there's an envelope header; if not, write one. - if (strncmp(m_dataBuffer, "From ", 5)) - { -- m_fileStream->Write("From "CRLF, 7, &bytesWritten); -+ m_fileStream->Write("From " CRLF, 7, &bytesWritten); - m_offlineMsgSize += bytesWritten; - } - } -diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-release/mailnews/compose/src/nsSmtpProtocol.cpp ---- comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200 -+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 10:51:33.365535861 +0200 -@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit() - { - m_sendDone = true; - nsCOMPtr url = do_QueryInterface(m_runningURL); -- SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server. -+ SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server. - m_nextState = SMTP_RESPONSE; - m_nextStateAfterResponse = SMTP_DONE; - return(0); -@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI - { - nsCOMPtr url = do_QueryInterface(m_runningURL); - // send a quit command to close the connection with the server. -- if (SendData(url, "QUIT"CRLF) == NS_OK) -+ if (SendData(url, "QUIT" CRLF) == NS_OK) - { - m_nextState = SMTP_RESPONSE; - m_nextStateAfterResponse = SMTP_ERROR_DONE; -@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC - NS_ENSURE_SUCCESS(rv,rv); - return rv; - } -- -diff -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release/mailnews/imap/src/nsImapMailFolder.cpp ---- comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-04-21 00:32:39.000000000 +0200 -+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 10:51:33.367535861 +0200 -@@ -8309,7 +8309,7 @@ nsImapMailFolder::CopyFileToOfflineStore - bool needMoreData = false; - char * newLine = nsnull; - PRUint32 numBytesInLine = 0; -- const char *envelope = "From "CRLF; -+ const char *envelope = "From " CRLF; - offlineStore->Write(envelope, strlen(envelope), &bytesWritten); - fileSize += bytesWritten; - do -diff -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/mailnews/imap/src/nsImapProtocol.cpp ---- comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200 -+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 10:51:33.370535858 +0200 -@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses - { - // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); - nsCAutoString commandBuffer(GetServerCommandTag()); -- commandBuffer.Append(" IDLE"CRLF); -+ commandBuffer.Append(" IDLE" CRLF); - - do - { -@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c - commandString.Append(messageIds); - commandString.Append(" ("); - commandString.Append(attribute); -- commandString.Append(")"CRLF); -+ commandString.Append(")" CRLF); - nsresult rv = SendData(commandString.get()); - - if (NS_SUCCEEDED(rv)) -@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge() - - IncrementCommandTagNumber(); - nsCAutoString command(GetServerCommandTag()); -- command.Append(" expunge"CRLF); -+ command.Append(" expunge" CRLF); - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID() - command.Append(gAppName); - command.Append("\" \"version\" \""); - command.Append(gAppVersion); -- command.Append("\")"CRLF); -+ command.Append("\")" CRLF); - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const - nsCAutoString correctedPassword; - EscapeUserNamePasswordString(password.get(), &correctedPassword); - command.Append(correctedPassword); -- command.Append("\""CRLF); -+ command.Append("\"" CRLF); - rv = SendData(command.get(), true /* suppress logging */); - NS_ENSURE_SUCCESS(rv, rv); - ParseIMAPandCheckForNewMail(); -@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const - nsCString command(GetServerCommandTag()); - command += " create \""; - command += escapedName; -- command += "\""CRLF; -+ command += "\"" CRLF; - - nsresult rv = SendData(command.get()); - if(NS_SUCCEEDED(rv)) -@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma - nsCString command (GetServerCommandTag()); - command += " lsub \"\" \""; - command += escapedPattern; -- command += "\""CRLF; -+ command += "\"" CRLF; - - PR_Free(boxnameWithOnlineDirectory); - -@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma - command += useXLIST ? - " xlist \"\" \"" : " list \"\" \""; - command += escapedPattern; -- command += "\""CRLF; -+ command += "\"" CRLF; - - PR_Free(boxnameWithOnlineDirectory); - -@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha - nsCString command (GetServerCommandTag()); - command += " subscribe \""; - command += escapedName; -- command += "\""CRLF; -+ command += "\"" CRLF; - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c - nsCString command (GetServerCommandTag()); - command += " unsubscribe \""; - command += escapedName; -- command += "\""CRLF; -+ command += "\"" CRLF; - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle() - if (m_urlInProgress) - return; - nsCAutoString command (GetServerCommandTag()); -- command += " IDLE"CRLF; -+ command += " IDLE" CRLF; - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) - { -@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo - nsCOMPtr asyncInputStream = do_QueryInterface(m_inputStream); - if (asyncInputStream) - asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); -- nsresult rv = SendData("DONE"CRLF); -+ nsresult rv = SendData("DONE" CRLF); - // set a short timeout if we don't want to wait for a response - if (m_transport && !waitForResponse) - m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5); -@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m - PRUint32 msgsHandled = 0; - const char *formatString; - formatString = (idsAreUid) -- ? "%s uid store %s %s"CRLF -- : "%s store %s %s"CRLF; -+ ? "%s uid store %s %s" CRLF -+ : "%s store %s %s" CRLF; - - do - { -diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp ---- comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-04-21 00:32:39.000000000 +0200 -+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 10:51:33.374535858 +0200 -@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM - - NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && - *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string"); -- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF); -+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF); - if (sendingIdleDone) - fWaitingForMoreClientInput = false; - -diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/mailnews/local/src/nsPop3Protocol.cpp ---- comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-04-21 00:32:40.000000000 +0200 -+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 10:51:33.375535858 +0200 -@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList() - return(MK_OUT_OF_MEMORY); - m_pop3ConData->next_state_after_response = POP3_GET_LIST; - m_listpos = 0; -- return SendData(m_url, "LIST"CRLF); -+ return SendData(m_url, "LIST" CRLF); - } - - -diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnews/mime/src/mimedrft.cpp ---- comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-04-21 00:32:40.000000000 +0200 -+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 10:51:33.376535858 +0200 -@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio - *newbody = 0; - PL_strcatn(newbody, newbodylen, "
");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "
"CRLF); -+ PL_strcatn(newbody, newbodylen, "" CRLF); - PR_Free(body); - body = newbody; - } -diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnews/mime/src/mimemult.cpp ---- comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-04-21 00:32:40.000000000 +0200 -+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-25 10:52:45.835512632 +0200 -@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\"")); - MimeWriteAString(obj, fileName); -- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: ")); - MimeWriteAString(obj, obj->options->state->detachedFilePath); - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); -@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li - status = MimeWriteAString(obj, header); - if (status < 0) - return status; -- status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK)); -+ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: ")); - MimeWriteAString(obj, fileName); -- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\"")); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\"")); - } - nsCString result; - char timeBuffer[128]; -@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li - "%a %b %d %H:%M:%S %Y", - &now); - MimeWriteAString(obj, nsDependentCString(timeBuffer)); -- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); -- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK)); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK)); - MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false); - } - PRInt32 old_nchildren = container->nchildren; -- cgit