back out my changes

mailnews/base/src/nsMsgAccountManager.cpp

@@ -1740,7 +1740,7 @@ nsMsgAccountManager::Convert4XUri(const char *old_uri, PRBool for_news, const ch
 
         rv = url->GetHost(getter_Copies(hostname));
         if (NS_FAILED(rv)) return rv;
-        rv = url->GetUsername(getter_Copies(username));  
+        rv = url->GetPreHost(getter_Copies(username));  
 	if (NS_FAILED(rv)) return rv;
 
 	// in 4.x, mac and windows stored the URI as IMAP://<hostname> 

mailnews/base/util/nsMsgFolder.cpp

@@ -500,7 +500,7 @@ nsMsgFolder::parseURI(PRBool needServer)
     if (!server && needServer) {
       // Get username and hostname so we can get the server
       nsXPIDLCString userName;
-      rv = url->GetUsername(getter_Copies(userName));
+      rv = url->GetPreHost(getter_Copies(userName));
       if (NS_SUCCEEDED(rv) && (const char*)userName)
         nsUnescape(NS_CONST_CAST(char*,(const char*)userName));
       
@@ -568,10 +568,10 @@ nsMsgFolder::parseURI(PRBool needServer)
           newPath += "/";
         }
         
-		hashedToken = token;
-		NS_MsgHashIfNecessary(hashedToken);
-		newPath += hashedToken;
-		haveFirst=PR_TRUE;
+        hashedToken = token;
+        NS_MsgHashIfNecessary(hashedToken);
+        newPath += hashedToken;
+        haveFirst=PR_TRUE;
       }
       
       token = nsCRT::strtok(newStr, "/", &newStr);

mailnews/local/src/nsLocalMailFolder.cpp

@@ -1818,7 +1818,7 @@ nsMsgLocalMailFolder::GetIncomingServerType()
   if (NS_FAILED(rv)) return "";
 
   nsXPIDLCString userName;
-  rv = url->GetUsername(getter_Copies(userName));
+  rv = url->GetPreHost(getter_Copies(userName));
   if (NS_FAILED(rv)) return "";
   if ((const char *) userName)
 	nsUnescape(NS_CONST_CAST(char*,(const char*)userName));