261643 don't register error strings by name - they can be found by value too.

r+sr=darin

netwerk/base/src/nsIOService.cpp

@@ -203,12 +203,6 @@ nsIOService::Init()
     nsCOMPtr<nsIErrorService> errorService = do_GetService(kErrorServiceCID);
     if (errorService) {
         errorService->RegisterErrorStringBundle(NS_ERROR_MODULE_NETWORK, NECKO_MSGS_URL);
-        errorService->RegisterErrorStringBundleKey(nsISocketTransport::STATUS_RESOLVING, "ResolvingHost");
-        errorService->RegisterErrorStringBundleKey(nsISocketTransport::STATUS_CONNECTED_TO, "ConnectedTo");
-        errorService->RegisterErrorStringBundleKey(nsISocketTransport::STATUS_SENDING_TO, "SendingTo");
-        errorService->RegisterErrorStringBundleKey(nsISocketTransport::STATUS_RECEIVING_FROM, "ReceivingFrom");
-        errorService->RegisterErrorStringBundleKey(nsISocketTransport::STATUS_CONNECTING_TO, "ConnectingTo");
-        errorService->RegisterErrorStringBundleKey(nsISocketTransport::STATUS_WAITING_FOR, "WaitingFor");
     }
     else
         NS_WARNING("failed to get error service");

netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp

@@ -60,7 +60,6 @@
 #include "nsIProgressEventSink.h"
 #include "prlog.h"
 #include "nsNetUtil.h"
-#include "nsIErrorService.h" 
 #include "nsIPrefService.h"
 #include "nsIPrefBranchInternal.h"
 #include "nsIObserverService.h"
@@ -90,7 +89,6 @@ PRLogModuleInfo* gFTPLog = nsnull;
 #define IDLE_CONNECTION_LIMIT 8 /* XXX pref me */
 
 static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
-static NS_DEFINE_CID(kErrorServiceCID, NS_ERRORSERVICE_CID);
 static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID);
 
 nsFtpProtocolHandler *gFtpHandler = nsnull;
@@ -128,15 +126,6 @@ nsFtpProtocolHandler::Init()
 {
     nsresult rv;
 
-    // XXX hack until xpidl supports error info directly (http://bugzilla.mozilla.org/show_bug.cgi?id=13423)
-    nsCOMPtr<nsIErrorService> errorService = do_GetService(kErrorServiceCID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_BEGIN_FTP_TRANSACTION, "BeginFTPTransaction");
-        if (NS_FAILED(rv)) return rv;
-        rv = errorService->RegisterErrorStringBundleKey(NS_NET_STATUS_END_FTP_TRANSACTION, "EndFTPTransaction");
-        if (NS_FAILED(rv)) return rv;
-    }
-
     if (mIdleTimeout == -1) {
         nsCOMPtr<nsIPrefBranchInternal> branch = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
         if (NS_FAILED(rv)) return rv;

netwerk/resources/locale/en-US/necko.properties

@@ -1,79 +0,0 @@
-# ***** 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 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 *****
-
-#ResolvingHost=Looking up
-#ConnectedTo=Connected to 
-#ConnectingTo=Connecting to 
-#SendingRequestTo=Sending request to 
-#TransferringDataFrom=Transferring data from 
-
-3=Looking up %1$S...
-4=Connected to %1$S...
-5=Sending request to %1$S...
-6=Transferring data from %1$S...
-7=Connecting to %1$S...
-8=Read %1$S 
-9=Wrote %1$S
-
-ResolvingHost=Looking up %1$S...
-ConnectedTo=Connected to %1$S...
-SendingTo=Sending request to %1$S...
-ReceivingFrom=Transferring data from %1$S...
-ConnectingTo=Connecting to %1$S...
-ReadFrom=Read %1$S 
-WroteTo=Wrote %1$S
-WaitingFor=Waiting for %1$S...
-BeginFTPTransaction=Beginning FTP transaction...
-EndFTPTransaction=Finished FTP transaction
-EnterUserPasswordForRealm=Enter username and password for "%1$S" at %2$S
-EnterUserPasswordForProxy=Enter username and password for proxy "%1$S" at %2$S
-EnterUserPasswordFor=Enter username and password for %1$S
-EnterPasswordFor=Enter password for %1$S on %2$S
-UnsupportedFTPServer=The FTP server %1$S is currently unsupported.
-RepostFormData=This web page is being redirected to a new location. Would you like to resend the form data you have typed to the new location?
-
-# Directory listing strings
-DirTitle=Index of %1$S
-DirGoUp=Up to higher level directory
-
-#Gopher Search Prompt
-GopherPromptTitle=Search
-GopherPromptText=Enter a search term:
-
-PhishingAuth=You are about to visit \"%1$S\". This site may be attempting to trick you into thinking you are visiting a different site. Use extreme caution.
-PhishingAuthAccept=I understand and will be very careful
-SuperfluousAuth=You are about to log into the site \"%1$S\" with the username \"%2$S\", but the website does not require authentication. This may be an attempt to trick you.\n\nIs \"%1$S\" the site you want to visit?
-AutomaticAuth=You are about to log into the site \"%1$S\" with the username \"%2$S\".