From f65b0c622c794d624bc60a7744dd91d2c5e44d8f Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <ayg@aryeh.name>
Date: Tue, 14 Aug 2012 12:33:27 +0300
Subject: [PATCH] Bug 780618 - Fix broken nsNetError.h references in
 comm-central; r=mconley

---
 calendar/providers/wcap/calWcapErrors.js            | 2 +-
 calendar/resources/content/calendarService.js       | 2 +-
 chat/modules/socket.jsm                             | 2 +-
 ldap/xpcom/src/nsLDAPConnection.cpp                 | 2 +-
 mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp | 2 +-
 mailnews/base/src/nsMsgProgress.cpp                 | 2 +-
 mailnews/compose/src/nsMsgSend.cpp                  | 2 +-
 mailnews/compose/src/nsMsgSendReport.cpp            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/calendar/providers/wcap/calWcapErrors.js b/calendar/providers/wcap/calWcapErrors.js
index ce3ed5fa3e..d0b71f79a7 100644
--- a/calendar/providers/wcap/calWcapErrors.js
+++ b/calendar/providers/wcap/calWcapErrors.js
@@ -44,7 +44,7 @@ function checkErrorCode(err, rcBits, maskBits) {
 
 // Cannot perform operation, because user is offline.
 // The following error codes have been adopted from
-// netwerk/base/public/nsNetError.h
+// xpcom/base/nsError.h
 // and ought to be defined in IDL. xxx todo
 
 // The requested action could not be completed while the networking
diff --git a/calendar/resources/content/calendarService.js b/calendar/resources/content/calendarService.js
index a400b9fb20..e098d8f2e7 100644
--- a/calendar/resources/content/calendarService.js
+++ b/calendar/resources/content/calendarService.js
@@ -98,7 +98,7 @@ ICALContentHandler.prototype = {
 
         // Cancel the request ...
         let uri = channel.URI;
-        const NS_BINDING_ABORTED = 0x804b0002 // from nsNetError.h
+        const NS_BINDING_ABORTED = 0x804b0002 // from nsError.h
         aRequest.cancel(NS_BINDING_ABORTED);
 
         // ... Subscribe to the uri ...
diff --git a/chat/modules/socket.jsm b/chat/modules/socket.jsm
index f76fbf8b0b..6dca6c35ed 100644
--- a/chat/modules/socket.jsm
+++ b/chat/modules/socket.jsm
@@ -49,7 +49,7 @@ const EXPORTED_SYMBOLS = ["Socket"];
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 
-// Network errors see: netwerk/base/public/nsNetError.h
+// Network errors see: xpcom/base/nsError.h
 const NS_ERROR_MODULE_NETWORK = 2152398848;
 const NS_ERROR_CONNECTION_REFUSED = NS_ERROR_MODULE_NETWORK + 13;
 const NS_ERROR_NET_TIMEOUT = NS_ERROR_MODULE_NETWORK + 14;
diff --git a/ldap/xpcom/src/nsLDAPConnection.cpp b/ldap/xpcom/src/nsLDAPConnection.cpp
index 2afecce752..ec9058f693 100644
--- a/ldap/xpcom/src/nsLDAPConnection.cpp
+++ b/ldap/xpcom/src/nsLDAPConnection.cpp
@@ -15,7 +15,7 @@
 #include "nsIDNSService.h"
 #include "nsIDNSRecord.h"
 #include "nsIRequestObserver.h"
-#include "nsNetError.h"
+#include "nsError.h"
 #include "nsLDAPOperation.h"
 #include "nsILDAPErrors.h"
 #include "nsIClassInfoImpl.h"
diff --git a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
index e984aba554..47ac467f21 100644
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
@@ -13,7 +13,7 @@
 #include "nsIStringBundle.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
-#include "nsNetError.h"
+#include "nsError.h"
 #include "nsMemory.h"
 #include "nsILDAPErrors.h"
 #include "nsMsgUtils.h"
diff --git a/mailnews/base/src/nsMsgProgress.cpp b/mailnews/base/src/nsMsgProgress.cpp
index 17e58ddfb4..ef5b63a315 100644
--- a/mailnews/base/src/nsMsgProgress.cpp
+++ b/mailnews/base/src/nsMsgProgress.cpp
@@ -10,7 +10,7 @@
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIComponentManager.h"
-#include "nsNetError.h"
+#include "nsError.h"
 #include "nsIWindowWatcher.h"
 #include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
diff --git a/mailnews/compose/src/nsMsgSend.cpp b/mailnews/compose/src/nsMsgSend.cpp
index a77d6d05fb..c548c01a7f 100644
--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -57,7 +57,7 @@
 #include "nsILoadGroup.h"
 #include "nsMsgSendReport.h"
 #include "nsNetCID.h"
-#include "nsNetError.h"
+#include "nsError.h"
 #include "nsMsgUtils.h"
 #include "nsIMsgMdnGenerator.h"
 #include "nsISmtpServer.h"
diff --git a/mailnews/compose/src/nsMsgSendReport.cpp b/mailnews/compose/src/nsMsgSendReport.cpp
index 16fe028617..65bd75b252 100644
--- a/mailnews/compose/src/nsMsgSendReport.cpp
+++ b/mailnews/compose/src/nsMsgSendReport.cpp
@@ -9,7 +9,7 @@
 #include "nsIMsgCompose.h"
 #include "nsMsgCompCID.h"
 #include "nsMsgPrompts.h"
-#include "nsNetError.h"
+#include "nsError.h"
 #include "nsComposeStrings.h"
 #include "nsIStringBundle.h"
 #include "nsServiceManagerUtils.h"