From b5d2eacffaa94a6b702512f35dbb69fdc1fa0972 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Tue, 16 May 2000 21:17:55 +0000 Subject: [PATCH] Reverted serverPasswordRealm back to serverURI. Bug 39453. git-svn-id: svn://10.0.0.236/trunk@70085 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/public/nsIMsgIncomingServer.idl | 2 +- mozilla/mailnews/base/src/nsSubscribableServer.cpp | 4 ++-- mozilla/mailnews/base/util/nsMsgIncomingServer.cpp | 10 +++++----- mozilla/mailnews/compose/src/nsMsgCopy.cpp | 2 +- mozilla/mailnews/imap/src/nsImapIncomingServer.cpp | 2 +- mozilla/mailnews/local/src/nsMailboxUrl.cpp | 2 +- mozilla/mailnews/news/src/nsNntpService.cpp | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl b/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl index 4016e01e53b..2e4083a378e 100644 --- a/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl +++ b/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl @@ -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; diff --git a/mozilla/mailnews/base/src/nsSubscribableServer.cpp b/mozilla/mailnews/base/src/nsSubscribableServer.cpp index c31b0d5593b..64c3ba52694 100644 --- a/mozilla/mailnews/base/src/nsSubscribableServer.cpp +++ b/mozilla/mailnews/base/src/nsSubscribableServer.cpp @@ -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; diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index f1196d78030..05f5a1edc17 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -182,7 +182,7 @@ nsMsgIncomingServer::CloseCachedConnections() // construct ://[@]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(""); diff --git a/mozilla/mailnews/compose/src/nsMsgCopy.cpp b/mozilla/mailnews/compose/src/nsMsgCopy.cpp index d63b7c39eeb..6d14517b3d1 100644 --- a/mozilla/mailnews/compose/src/nsMsgCopy.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCopy.cpp @@ -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; diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp index 8ca789e4034..fe52041508b 100644 --- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -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); diff --git a/mozilla/mailnews/local/src/nsMailboxUrl.cpp b/mozilla/mailnews/local/src/nsMailboxUrl.cpp index aacfe2d439f..835f11d93f1 100644 --- a/mozilla/mailnews/local/src/nsMailboxUrl.cpp +++ b/mozilla/mailnews/local/src/nsMailboxUrl.cpp @@ -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 diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index b9bbd49d279..bf0ee413957 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -1270,7 +1270,7 @@ NS_IMETHODIMP nsNntpService::Search(nsIMsgSearchSession *aSearchSession, nsIMsgW nsCOMPtr 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;