Enigmail 1.4.1 for Thunderbird 12.0

1 files changed, 45 insertions, 45 deletions

diff --git a/mozilla-733867-x.patch b/mozilla-733867-x.patch
index 9b6fcb8..92116dc 100644
--- a/mozilla-733867-x.patch
+++ b/mozilla-733867-x.patch
@@ -1,6 +1,6 @@
-diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867	2012-03-13 03:37:12.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-16 07:20:29.299342799 +0100
+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));
@@ -10,10 +10,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapt
      PL_strcat(encoding, value);
      return NS_OK;
    }
-diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-16 07:20:29.300342735 +0100
-@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+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
            }
          }
        }
@@ -22,7 +22,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cp
  
         // 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.
-@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila
          // check if there's an envelope header; if not, write one.
          if (strncmp(m_dataBuffer, "From ", 5))
          {
@@ -31,19 +31,19 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cp
            m_offlineMsgSize += bytesWritten;
          }
        }
-diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-16 07:23:01.225877457 +0100
+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 = PR_TRUE;
+   m_sendDone = true;
    nsCOMPtr<nsIURI> 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 
+@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI
      {
        nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
        // send a quit command to close the connection with the server.
@@ -57,10 +57,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.7
      return rv;
  }
 -
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-16 07:20:29.309342162 +0100
-@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore
+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;
@@ -69,10 +69,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.73
            offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
            fileSize += bytesWritten;
            do
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-03-16 07:20:29.314341844 +0100
-@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses
+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());
@@ -81,7 +81,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    do
    {
-@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c
+@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c
      commandString.Append(messageIds);
      commandString.Append(" (");
      commandString.Append(attribute);
@@ -114,10 +114,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
      command.Append(correctedPassword);
 -    command.Append("\""CRLF);
 +    command.Append("\"" CRLF);
-     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+     rv = SendData(command.get(), true /* suppress logging */);
      NS_ENSURE_SUCCESS(rv, rv);
      ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const
+@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const
    nsCString command(GetServerCommandTag());
    command += " create \"";
    command += escapedName;
@@ -126,7 +126,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    nsresult rv = SendData(command.get());
    if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma
+@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma
    nsCString command (GetServerCommandTag());
    command += " lsub \"\" \"";
    command += escapedPattern;
@@ -135,7 +135,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    PR_Free(boxnameWithOnlineDirectory);
  
-@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma
+@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma
    command += useXLIST ?
      " xlist \"\" \"" : " list \"\" \"";
    command += escapedPattern;
@@ -144,7 +144,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    PR_Free(boxnameWithOnlineDirectory);
  
-@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha
+@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha
    nsCString command (GetServerCommandTag());
    command += " subscribe \"";
    command += escapedName;
@@ -153,7 +153,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    nsresult rv = SendData(command.get());
    if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c
+@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c
    nsCString command (GetServerCommandTag());
    command += " unsubscribe \"";
    command += escapedName;
@@ -162,7 +162,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    nsresult rv = SendData(command.get());
    if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle()
+@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle()
    if (m_urlInProgress)
      return;
    nsCAutoString command (GetServerCommandTag());
@@ -171,7 +171,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
    nsresult rv = SendData(command.get());
    if (NS_SUCCEEDED(rv))
    {
-@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo
+@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo
    nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
    if (asyncInputStream)
      asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
@@ -180,7 +180,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
    // 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);
-@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m
+@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m
    PRUint32 msgsHandled = 0;
    const char *formatString;
    formatString = (idsAreUid)
@@ -191,9 +191,9 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338
  
    do
    {
-diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-16 07:20:29.316341717 +0100
+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' && 
@@ -201,11 +201,11 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponsePar
 -  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
 +  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
    if (sendingIdleDone)
-     fWaitingForMoreClientInput = PR_FALSE;
+     fWaitingForMoreClientInput = false;
  
-diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-03-16 07:23:38.980300990 +0100
+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;
@@ -215,9 +215,9 @@ diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733
  }
  
  
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp	2012-03-16 07:20:29.320341461 +0100
+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, "<PRE>");
@@ -227,9 +227,9 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thu
                  PR_Free(body);
                  body = newbody;
                }
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp	2012-03-16 07:20:29.321341397 +0100
+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=\""));
@@ -260,6 +260,6 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu
 -          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, PR_FALSE);
+           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
          }
          PRInt32 old_nchildren = container->nchildren;