Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted serverPasswordRealm back to serverURI. Bug 39453.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@70085 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
2000-05-16 21:17:55 +00:00
parent f2b7677c98
commit b5d2eacffa
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/mailnews/base/public/nsIMsgIncomingServer.idl
View File

@@ -103,7 +103,7 @@ interface nsIMsgIncomingServer : nsISupports {
/* the RDF URI for the root mail folder */
readonly attribute string serverPasswordRealm;
readonly attribute string serverURI;
/* the root folder for this server */
attribute nsIFolder RootFolder;

4
mozilla/mailnews/base/src/nsSubscribableServer.cpp
View File

@@ -75,7 +75,7 @@ nsSubscribableServer::SetAsSubscribedInSubscribeDS(const char *aName)
nsXPIDLCString serverUri;
rv = mIncomingServer->GetServerPasswordRealm(getter_Copies(serverUri));
rv = mIncomingServer->GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
nsCAutoString uri;
@@ -157,7 +157,7 @@ nsSubscribableServer::AddToSubscribeDS(const char *aName)
#endif
nsXPIDLCString serverUri;
rv = mIncomingServer->GetServerPasswordRealm(getter_Copies(serverUri));
rv = mIncomingServer->GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
nsCAutoString uri;

10
mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
View File

@@ -182,7 +182,7 @@ nsMsgIncomingServer::CloseCachedConnections()
// construct <localStoreType>://[<username>@]<hostname
NS_IMETHODIMP
nsMsgIncomingServer::GetServerPasswordRealm(char* *aResult)
nsMsgIncomingServer::GetServerURI(char* *aResult)
{
NS_ENSURE_ARG_POINTER(aResult);
nsresult rv;
@@ -229,7 +229,7 @@ nsMsgIncomingServer::CreateRootFolder()
nsresult rv;
// get the URI from the incoming server
nsXPIDLCString serverUri;
rv = GetServerPasswordRealm(getter_Copies(serverUri));
rv = GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIRDFService, rdf,
@@ -639,7 +639,7 @@ nsMsgIncomingServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, const
{
nsXPIDLString uniPassword;
nsXPIDLCString serverUri;
rv = GetServerPasswordRealm(getter_Copies(serverUri));
rv = GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
rv = dialog->PromptPassword(aPromptTitle, aPromptMessage,
NS_ConvertToString(serverUri).GetUnicode(), PR_TRUE,
@@ -677,7 +677,7 @@ nsMsgIncomingServer::StorePassword()
if (NS_FAILED(rv)) return rv;
nsXPIDLCString serverUri;
rv = GetServerPasswordRealm(getter_Copies(serverUri));
rv = GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
nsAutoString password; password.AssignWithConversion((const char *)pwd);
@@ -694,7 +694,7 @@ nsMsgIncomingServer::ForgetPassword()
nsXPIDLCString serverUri;
rv = GetServerPasswordRealm(getter_Copies(serverUri));
rv = GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
rv = SetPassword("");

2
mozilla/mailnews/compose/src/nsMsgCopy.cpp
View File

@@ -369,7 +369,7 @@ LocateMessageFolder(nsIMsgIdentity *userIdentity,
// newsgroup://news.mozilla.org/netscape.test
//
char *serverURI = nsnull;
rv = inServer->GetServerPasswordRealm(&serverURI);
rv = inServer->GetServerURI(&serverURI);
if ( NS_FAILED(rv) || (!serverURI) || !(*serverURI) )
continue;

2
mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
View File

@@ -702,7 +702,7 @@ NS_IMETHODIMP nsImapIncomingServer::PossibleImapMailbox(const char *folderPath,
nsCAutoString uri;
nsXPIDLCString serverUri;
GetServerPasswordRealm(getter_Copies(serverUri));
GetServerURI(getter_Copies(serverUri));
uri.Assign(serverUri);

2
mozilla/mailnews/local/src/nsMailboxUrl.cpp
View File

@@ -99,7 +99,7 @@ static char *nsMailboxGetURI(const char *nativepath)
PRInt32 len = PL_strlen(serverPath);
if (PL_strncasecmp(serverPath, filePath, len) == 0) {
nsXPIDLCString serverURI;
rv = server->GetServerPasswordRealm(getter_Copies(serverURI));
rv = server->GetServerURI(getter_Copies(serverURI));
if (NS_FAILED(rv)) continue;
// the relpath is just past the serverpath

6
mozilla/mailnews/news/src/nsNntpService.cpp
View File

@@ -1270,7 +1270,7 @@ NS_IMETHODIMP nsNntpService::Search(nsIMsgSearchSession *aSearchSession, nsIMsgW
nsCOMPtr<nsIURI> uri;
nsXPIDLCString serverUri;
nsXPIDLString newsgroupName;
rv = server->GetServerPasswordRealm(getter_Copies(serverUri));
rv = server->GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
aMsgFolder->GetName(getter_Copies(newsgroupName));
if (NS_FAILED(rv)) return rv;
@@ -1309,7 +1309,7 @@ nsNntpService::UpdateCounts(nsINntpIncomingServer *aNntpServer, nsIMsgWindow *aM
if (!server) return NS_ERROR_FAILURE;
nsXPIDLCString serverUri;
rv = server->GetServerPasswordRealm(getter_Copies(serverUri));
rv = server->GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
rv = ConstructNntpUrl((const char *)serverUri, "", nsMsgKey_None, nsnull, getter_AddRefs(uri));
@@ -1337,7 +1337,7 @@ nsNntpService::BuildSubscribeDatasource(nsINntpIncomingServer *aNntpServer, nsIM
if (!server) return NS_ERROR_FAILURE;
nsXPIDLCString serverUri;
rv = server->GetServerPasswordRealm(getter_Copies(serverUri));
rv = server->GetServerURI(getter_Copies(serverUri));
nsCAutoString uriStr;
uriStr += (const char *)serverUri;