зеркало из https://github.com/mozilla/pjs.git
fixes 106736 and 106523. Regressions caused by nsIObserverService changes. r=chak@netscape.com r=morse@netscape.com
This commit is contained in:
Родитель
abb5f8b703
Коммит
eb9e0f1a2f
|
@ -482,9 +482,9 @@ BOOL CMfcEmbedApp::InitializeProfiles()
|
|||
nsresult rv;
|
||||
nsCOMPtr<nsIObserverService> observerService =
|
||||
do_GetService("@mozilla.org/observer-service;1", &rv);
|
||||
observerService->AddObserver(this, "profile-approve-change", PR_FALSE);
|
||||
observerService->AddObserver(this, "profile-change-teardown", PR_FALSE);
|
||||
observerService->AddObserver(this, "profile-after-change", PR_FALSE);
|
||||
observerService->AddObserver(this, "profile-approve-change", PR_TRUE);
|
||||
observerService->AddObserver(this, "profile-change-teardown", PR_TRUE);
|
||||
observerService->AddObserver(this, "profile-after-change", PR_TRUE);
|
||||
|
||||
m_ProfileMgr->StartUp();
|
||||
|
||||
|
|
|
@ -590,7 +590,7 @@ nsSingleSignOnPrompt::Init()
|
|||
if (!svc) return NS_ERROR_FAILURE;
|
||||
// The observer service holds the only ref to the observer
|
||||
// It thus has the lifespan of the observer service
|
||||
svc->AddObserver(observer, "profile-before-change", PR_TRUE);
|
||||
svc->AddObserver(observer, "profile-before-change", PR_FALSE);
|
||||
mgRegisteredObserver = PR_TRUE;
|
||||
}
|
||||
return NS_OK;
|
||||
|
|
Загрузка…
Ссылка в новой задаче