Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

supplimental fix for #113540, clean up code. rs=mscott

Browse Source
This commit is contained in:
sspitzer%netscape.com 2002-01-26 02:37:56 +00:00
parent 63798183b7
commit 062172ca37
3 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mailnews/base/util/nsMsgIncomingServer.cpp
View File

@ -771,37 +771,38 @@ nsMsgIncomingServer::StorePassword()
rv = GetPassword(getter_Copies(pwd));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIObserverService> os = do_GetService("@mozilla.org/observer-service;1");
if (os) {
nsXPIDLCString serverSpec;
rv = GetServerURI(getter_Copies(serverSpec));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), serverSpec);
nsXPIDLCString serverSpec;
rv = GetServerURI(getter_Copies(serverSpec));
if (NS_FAILED(rv)) return rv;
rv = os->NotifyObservers(uri, "login-succeeded", NS_ConvertUTF8toUCS2(pwd).get());
}
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), serverSpec);
rv = observerService->NotifyObservers(uri, "login-succeeded", NS_ConvertUTF8toUCS2(pwd).get());
NS_ENSURE_SUCCESS(rv,rv);
return rv;
}
NS_IMETHODIMP
nsMsgIncomingServer::ForgetPassword()
{
nsresult rv = NS_OK;
nsresult rv;
nsCOMPtr<nsIObserverService> os = do_GetService("@mozilla.org/observer-service;1");
if (os) {
nsXPIDLCString serverSpec;
rv = GetServerURI(getter_Copies(serverSpec));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), serverSpec);
nsXPIDLCString serverSpec;
rv = GetServerURI(getter_Copies(serverSpec));
if (NS_FAILED(rv)) return rv;
rv = os->NotifyObservers(uri, "login-failed", nsnull);
}
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), serverSpec);
rv = observerService->NotifyObservers(uri, "login-failed", nsnull);
NS_ENSURE_SUCCESS(rv,rv);
rv = SetPassword("");
return rv;

21
mailnews/compose/src/nsSmtpServer.cpp
View File

@ -323,17 +323,18 @@ nsSmtpServer::GetUsernamePasswordWithUI(const PRUnichar * aPromptMessage, const
NS_IMETHODIMP
nsSmtpServer::ForgetPassword()
{
nsresult rv = NS_OK;
nsCOMPtr<nsIObserverService> os = do_GetService("@mozilla.org/observer-service;1");
if (os) {
nsXPIDLCString serverUri;
rv = GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
nsresult rv;
nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), serverUri);
rv = os->NotifyObservers(uri, "login-failed", nsnull);
}
nsXPIDLCString serverUri;
rv = GetServerURI(getter_Copies(serverUri));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), serverUri);
rv = observerService->NotifyObservers(uri, "login-failed", nsnull);
NS_ENSURE_SUCCESS(rv,rv);
rv = SetPassword("");
return rv;

48
mailnews/news/src/nsNewsFolder.cpp
View File

@ -1271,39 +1271,41 @@ nsresult nsMsgNewsFolder::CreateNewsgroupUrlForSignon(const char *inUriStr, cons
NS_IMETHODIMP nsMsgNewsFolder::ForgetGroupUsername()
{
nsresult rv = NS_OK;
nsCOMPtr<nsIObserverService> os = do_GetService("@mozilla.org/observer-service;1");
if (os) {
rv = SetGroupUsername(nsnull);
if (NS_FAILED(rv)) return rv;
nsresult rv;
nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsXPIDLCString signonURL;
rv = CreateNewsgroupUsernameUrlForSignon(mURI, getter_Copies(signonURL));
if (NS_FAILED(rv)) return rv;
rv = SetGroupUsername(nsnull);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), signonURL);
rv = os->NotifyObservers(uri, "login-failed", nsnull);
}
nsXPIDLCString signonURL;
rv = CreateNewsgroupUsernameUrlForSignon(mURI, getter_Copies(signonURL));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), signonURL);
rv = observerService->NotifyObservers(uri, "login-failed", nsnull);
NS_ENSURE_SUCCESS(rv,rv);
return rv;
}
NS_IMETHODIMP nsMsgNewsFolder::ForgetGroupPassword()
{
nsresult rv = NS_OK;
nsCOMPtr<nsIObserverService> os = do_GetService("@mozilla.org/observer-service;1");
if (os) {
rv = SetGroupPassword(nsnull);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv,rv);
rv = SetGroupPassword(nsnull);
if (NS_FAILED(rv)) return rv;
nsXPIDLCString signonURL;
rv = CreateNewsgroupPasswordUrlForSignon(mURI, getter_Copies(signonURL));
if (NS_FAILED(rv)) return rv;
nsXPIDLCString signonURL;
rv = CreateNewsgroupPasswordUrlForSignon(mURI, getter_Copies(signonURL));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), signonURL);
rv = os->NotifyObservers(uri, "login-failed", nsnull);
}
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), signonURL);
rv = observerService->NotifyObservers(uri, "login-failed", nsnull);
NS_ENSURE_SUCCESS(rv,rv);
return rv;
}