back my changes out

mailnews/imap/src/nsImapService.cpp

@@ -2316,7 +2316,7 @@ NS_IMETHODIMP nsImapService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI
     // extract the user name and host name information...
     rv = mailnewsUrl->GetHost(getter_Copies(hostName));
     if (NS_FAILED(rv)) return rv;
-    rv = mailnewsUrl->GetUsername(getter_Copies(userName));
+    rv = mailnewsUrl->GetPreHost(getter_Copies(userName));
     if (NS_FAILED(rv)) return rv;
     // if we can't get a folder name out of the url then I think this is an error
     aImapUrl->CreateCanonicalSourceFolderPathString(getter_Copies(folderName));

mailnews/imap/src/nsImapUrl.cpp

@@ -271,7 +271,7 @@ nsresult nsImapUrl::ParseUrl()
 	NS_LOCK_INSTANCE();
 
     // extract the user name
-    GetUsername(getter_Copies(m_userName));
+    GetPreHost(getter_Copies(m_userName));
 
 	char * imapPartOfUrl = nsnull;
 	rv = GetPath(&imapPartOfUrl);

mailnews/news/src/nsNNTPProtocol.cpp

@@ -448,7 +448,7 @@ nsresult nsNNTPProtocol::Initialize(void)
 
 	rv = m_url->GetHost(getter_Copies(m_hostName));
 	if (NS_FAILED(rv)) return rv;
-	rv = m_url->GetUsername(getter_Copies(m_userName));
+	rv = m_url->GetPreHost(getter_Copies(m_userName));
 	if (NS_FAILED(rv)) return rv;
 
     // retrieve the AccountManager
@@ -551,7 +551,7 @@ nsresult nsNNTPProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer)
   {
 	  rv = aURL->GetHost(getter_Copies(m_hostName));
       if (NS_FAILED(rv)) return rv;
-      rv = aURL->GetUsername(getter_Copies(m_userName));
+      rv = aURL->GetPreHost(getter_Copies(m_userName));
       if (NS_FAILED(rv)) return rv;
       
 	  m_runningURL = do_QueryInterface(aURL, &rv);

mailnews/news/src/nsNntpUrl.cpp

@@ -327,7 +327,7 @@ NS_IMETHODIMP nsNntpUrl::GetMessageHeader(nsIMsgDBHdr ** aMsgHdr)
     if (NS_FAILED(rv)) return rv;
 
     nsXPIDLCString userName;
-    rv = GetUsername(getter_Copies(userName));
+    rv = GetPreHost(getter_Copies(userName));
     if (NS_FAILED(rv)) return rv; 
 
     nsCString newsgroupURI(kNewsMessageRootURI);