From bac3c7993838b94fc45826b69f62d154f5179f73 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Tue, 7 Nov 2000 08:04:06 +0000 Subject: [PATCH] fix for #59125 - back out some stuff that I didn't mean to checkin (wallet has to be loaded in main1() so that it registers correctly with the observer service) r=syd, sr=scc --- xpfe/bootstrap/nsAppRunner.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xpfe/bootstrap/nsAppRunner.cpp b/xpfe/bootstrap/nsAppRunner.cpp index d589050350c8..62b67475680d 100644 --- a/xpfe/bootstrap/nsAppRunner.cpp +++ b/xpfe/bootstrap/nsAppRunner.cpp @@ -42,6 +42,7 @@ #include "nsIDirectoryService.h" #include "nsAppDirectoryServiceDefs.h" #include "nsSpecialSystemDirectory.h" +#include "nsIWalletService.h" #include "nsIWindowMediator.h" #include "nsIDOMWindowInternal.h" #include "nsIClipboard.h" @@ -84,6 +85,7 @@ static NS_DEFINE_CID(kSoftUpdateCID, NS_SoftwareUpdate_CID); static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); +static NS_DEFINE_CID(kWalletServiceCID, NS_WALLETSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); @@ -1004,7 +1006,9 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp ) NS_ASSERTION(NS_SUCCEEDED(rv), "failed to Ensure1Window"); if (NS_FAILED(rv)) return rv; - + // Startup wallet service so it registers for notifications + NS_WITH_SERVICE(nsIWalletService, walletService, kWalletServiceCID, &rv); + InitCachePrefs(); // Start main event loop