Bug 616816 Remove unwanted CR characters r=bienvenu
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 05 Dec 2010 20:30:51 +0000
changeset 6795 07d07bebd7f0723f27f1e465e301a6cb1809153b
parent 6794 2cf4968b500a2371000feac979adcff2a36bd7cd
child 6796 a02c207dff032a746bd644753271ed852f5a23bc
push idunknown
push userunknown
push dateunknown
reviewersbienvenu
bugs616816
Bug 616816 Remove unwanted CR characters r=bienvenu
mailnews/base/src/nsMsgXFViewThread.cpp
mailnews/extensions/smime/content/certFetchingStatus.js
mailnews/local/public/nsIMailboxUrl.idl
mailnews/mime/src/mimecms.cpp
--- a/mailnews/base/src/nsMsgXFViewThread.cpp
+++ b/mailnews/base/src/nsMsgXFViewThread.cpp
@@ -461,24 +461,24 @@ NS_IMETHODIMP nsMsgXFViewThread::GetNewe
 }
 
 NS_IMETHODIMP nsMsgXFViewThread::SetNewestMsgDate(PRUint32 aNewestMsgDate) 
 {
   m_newestMsgDate = aNewestMsgDate;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgXFViewThread::MarkChildRead(PRBool aRead)
-{
+NS_IMETHODIMP nsMsgXFViewThread::MarkChildRead(PRBool aRead)
+{
   ChangeUnreadChildCount(aRead ? -1 : 1);
   return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgXFViewThread::GetFirstUnreadChild(nsIMsgDBHdr **aResult)
-{
+}
+
+NS_IMETHODIMP nsMsgXFViewThread::GetFirstUnreadChild(nsIMsgDBHdr **aResult)
+{
   NS_ENSURE_ARG(aResult);
   PRUint32 numChildren;
   nsresult rv = NS_OK;
   
   GetNumChildren(&numChildren);
   
   if ((PRInt32) numChildren < 0)
     numChildren = 0;
@@ -500,15 +500,15 @@ NS_IMETHODIMP nsMsgXFViewThread::GetFirs
       if (NS_SUCCEEDED(rv) && !isRead)
       {
         NS_ADDREF(*aResult = child);
         break;
       }
     }
   }
   return rv;
-}
-NS_IMETHODIMP nsMsgXFViewThread::EnumerateMessages(PRUint32 aParentKey, 
-                                                   nsISimpleEnumerator **aResult)
-{
-  NS_ERROR("shouldn't call this");
-  return NS_ERROR_NOT_IMPLEMENTED;
 }
+NS_IMETHODIMP nsMsgXFViewThread::EnumerateMessages(PRUint32 aParentKey,
+                                                   nsISimpleEnumerator **aResult)
+{
+  NS_ERROR("shouldn't call this");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
--- a/mailnews/extensions/smime/content/certFetchingStatus.js
+++ b/mailnews/extensions/smime/content/certFetchingStatus.js
@@ -143,19 +143,19 @@ function getLDAPOperation()
                             Components.interfaces.nsILDAPMessageListener),
                         null);
 }
 
 function getPassword()
 {
   // we only need a password if we are using credentials
   if (gLogin)
-  {
-    var windowWatcherSvc = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                            .getService(Components.interfaces.nsIWindowWatcher);
+  {
+    var windowWatcherSvc = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                            .getService(Components.interfaces.nsIWindowWatcher);
     var authPrompter = windowWatcherSvc.getNewAuthPrompter(window.QueryInterface(Components.interfaces.nsIDOMWindow));    
     var strBundle = document.getElementById('bundle_ldap');
     var password = { value: "" };
     
     // nsLDAPAutocompleteSession uses asciiHost instead of host for the prompt text, I think we should be
     // consistent. 
     if (authPrompter.promptPassword(strBundle.getString("authPromptTitle"),  
                                      strBundle.getFormattedString("authPromptText", [gLdapServerURL.asciiHost]),
--- a/mailnews/local/public/nsIMailboxUrl.idl
+++ b/mailnews/local/public/nsIMailboxUrl.idl
@@ -1,94 +1,94 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-#include "MailNewsTypes2.idl"
-
-interface nsIStreamListener;
-interface nsIMsgDBHdr;
-%{C++
-#include "nsIStreamListener.h"
-%}
-
-typedef long nsMailboxAction;
-
-[scriptable, uuid(2ac72280-90f4-4d80-8af1-5e7a1997e2a8)]
-interface nsIMailboxUrl : nsISupports {
-
-  // Mailbox urls which parse a mailbox folder require a consumer of the
-    // stream which will represent the mailbox. This consumer is the mailbox
-    // parser. As data from the mailbox folder is read in, the data will be
-    // written to a stream and the consumer will be notified through
-    // nsIStreamListenter::OnDataAvailable that the stream has data
-  // available...
-  // mscott: I wonder if the caller should be allowed to create and set
-    // the stream they want the data written to as well? Hmm....
-
-    attribute nsIStreamListener mailboxParser;
-
-  /////////////////////////////////////////////////////////////////////////
-  // Copy/Move mailbox urls require a mailbox copy handler which actually
-    // performs the copy.
-  /////////////////////////////////////////////////////////////////////////
-    attribute nsIStreamListener mailboxCopyHandler;
-
-    // Some mailbox urls include a message key for the message in question.
-    readonly attribute nsMsgKey messageKey;
-
-    // this is to support multiple msg move/copy in one url
-    void setMoveCopyMsgKeys(out nsMsgKey keysToFlag, in long numKeys);
-    void getMoveCopyMsgHdrForIndex(in unsigned long msgIndex, out nsIMsgDBHdr msgHdr);
-    readonly attribute unsigned long numMoveCopyMsgs;
-    attribute unsigned long curMoveCopyMsgIndex;
-  // mailbox urls to fetch a mail message can specify the size of
-    // the message...
-  // this saves us the trouble of having to open up the msg db and ask
-    // ourselves...
-    attribute unsigned long messageSize;
-
-    attribute nsMailboxAction mailboxAction;
-
-    /* these are nsMailboxActions */
-  const long ActionParseMailbox = 0;
-    const long ActionFetchMessage = 1;
-    const long ActionCopyMessage = 2;
-  const long ActionMoveMessage = 3;
-  const long ActionSaveMessageToDisk = 4;
-  const long ActionAppendMessageToDisk = 5;
-  const long ActionFetchPart = 6;
-};
-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+#include "MailNewsTypes2.idl"
+
+interface nsIStreamListener;
+interface nsIMsgDBHdr;
+%{C++
+#include "nsIStreamListener.h"
+%}
+
+typedef long nsMailboxAction;
+
+[scriptable, uuid(2ac72280-90f4-4d80-8af1-5e7a1997e2a8)]
+interface nsIMailboxUrl : nsISupports {
+
+  // Mailbox urls which parse a mailbox folder require a consumer of the
+  // stream which will represent the mailbox. This consumer is the mailbox
+  // parser. As data from the mailbox folder is read in, the data will be
+  // written to a stream and the consumer will be notified through
+  // nsIStreamListenter::OnDataAvailable that the stream has data
+  // available...
+  // mscott: I wonder if the caller should be allowed to create and set
+  // the stream they want the data written to as well? Hmm....
+
+  attribute nsIStreamListener mailboxParser;
+
+  /////////////////////////////////////////////////////////////////////////
+  // Copy/Move mailbox urls require a mailbox copy handler which actually
+  // performs the copy.
+  /////////////////////////////////////////////////////////////////////////
+  attribute nsIStreamListener mailboxCopyHandler;
+
+  // Some mailbox urls include a message key for the message in question.
+  readonly attribute nsMsgKey messageKey;
+
+  // this is to support multiple msg move/copy in one url
+  void setMoveCopyMsgKeys(out nsMsgKey keysToFlag, in long numKeys);
+  void getMoveCopyMsgHdrForIndex(in unsigned long msgIndex, out nsIMsgDBHdr msgHdr);
+  readonly attribute unsigned long numMoveCopyMsgs;
+  attribute unsigned long curMoveCopyMsgIndex;
+  // mailbox urls to fetch a mail message can specify the size of
+  // the message...
+  // this saves us the trouble of having to open up the msg db and ask
+  // ourselves...
+  attribute unsigned long messageSize;
+
+  attribute nsMailboxAction mailboxAction;
+
+  /* these are nsMailboxActions */
+  const long ActionParseMailbox = 0;
+  const long ActionFetchMessage = 1;
+  const long ActionCopyMessage = 2;
+  const long ActionMoveMessage = 3;
+  const long ActionSaveMessageToDisk = 4;
+  const long ActionAppendMessageToDisk = 5;
+  const long ActionFetchPart = 6;
+};
+
--- a/mailnews/mime/src/mimecms.cpp
+++ b/mailnews/mime/src/mimecms.cpp
@@ -259,28 +259,28 @@ public:
 
   nsSMimeVerificationListener(const char *aFromAddr, const char *aFromName,
                               const char *aSenderAddr, const char *aSenderName,
                               nsIMsgSMIMEHeaderSink *aHeaderSink, PRInt32 aMimeNestingLevel);
 
   virtual ~nsSMimeVerificationListener() {}
   
 protected:
-  /**
-   * It is safe to declare this implementation as thread safe,
-   * despite not using a lock to protect the members.
-   * Because of the way the object will be used, we don't expect a race.
-   * After construction, the object is passed to another thread,
-   * but will no longer be accessed on the original thread.
-   * The other thread is unable to access/modify self's data members.
-   * When the other thread is finished, it will call into the "Notify"
-   * callback. Self's members will be accessed on the other thread,
-   * but this is fine, because there is no race with the original thread.
-   * Race-protection for XPCOM reference counting is sufficient.
-   */
+  /**
+   * It is safe to declare this implementation as thread safe,
+   * despite not using a lock to protect the members.
+   * Because of the way the object will be used, we don't expect a race.
+   * After construction, the object is passed to another thread,
+   * but will no longer be accessed on the original thread.
+   * The other thread is unable to access/modify self's data members.
+   * When the other thread is finished, it will call into the "Notify"
+   * callback. Self's members will be accessed on the other thread,
+   * but this is fine, because there is no race with the original thread.
+   * Race-protection for XPCOM reference counting is sufficient.
+   */
   nsCOMPtr<nsIMsgSMIMEHeaderSink> mHeaderSink;
   PRInt32 mMimeNestingLevel;
 
   nsCString mFromAddr;
   nsCString mFromName;
   nsCString mSenderAddr;
   nsCString mSenderName;
 };