Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-04 16:15:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix the orange by changing the timers to member variables of the service singletons, rather

Browse Source 
than static nsCOMPtrs!
r=sspitzer
a=fixing bustage
This commit is contained in:
alecf%netscape.com 2000-11-18 02:01:29 +00:00
parent 8b0edc8d91
commit 4c22bc7a46
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -1582,8 +1582,6 @@ BookmarkParser::setFolderHint(nsIRDFResource *newSource, nsIRDFResource *objType
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// BookmarkDataSourceImpl // BookmarkDataSourceImpl
nsCOMPtr<nsITimer> nsBookmarksService::mTimer;
nsBookmarksService::nsBookmarksService() nsBookmarksService::nsBookmarksService()
: mInner(nsnull), mBookmarksAvailable(PR_FALSE), mDirty(PR_FALSE), mUpdateBatchNest(0) : mInner(nsnull), mBookmarksAvailable(PR_FALSE), mDirty(PR_FALSE), mUpdateBatchNest(0)

2
xpfe/components/bookmarks/src/nsBookmarksService.h
View File

@ -58,7 +58,7 @@ protected:
nsCOMPtr<nsIStringBundle> mBundle; nsCOMPtr<nsIStringBundle> mBundle;
nsString mPersonalToolbarName; nsString mPersonalToolbarName;
PRInt32 mUpdateBatchNest; PRInt32 mUpdateBatchNest;
static nsCOMPtr<nsITimer> mTimer; nsCOMPtr<nsITimer> mTimer;
#ifdef XP_MAC #ifdef XP_MAC
PRBool mIEFavoritesAvailable; PRBool mIEFavoritesAvailable;

1
xpfe/components/search/src/nsInternetSearchService.cpp
View File

@ -314,7 +314,6 @@ nsCOMPtr<nsIRDFDataSource> InternetSearchDataSource::categoryDataSource;
PRBool InternetSearchDataSource::mEngineListBuilt; PRBool InternetSearchDataSource::mEngineListBuilt;
nsCOMPtr<nsILoadGroup> InternetSearchDataSource::mBackgroundLoadGroup; nsCOMPtr<nsILoadGroup> InternetSearchDataSource::mBackgroundLoadGroup;
nsCOMPtr<nsILoadGroup> InternetSearchDataSource::mLoadGroup; nsCOMPtr<nsILoadGroup> InternetSearchDataSource::mLoadGroup;
nsCOMPtr<nsITimer> InternetSearchDataSource::mTimer;
nsCOMPtr<nsIPref> InternetSearchDataSource::prefs; nsCOMPtr<nsIPref> InternetSearchDataSource::prefs;
nsIRDFResource *InternetSearchDataSource::kNC_SearchResult; nsIRDFResource *InternetSearchDataSource::kNC_SearchResult;

2
xpfe/components/search/src/nsInternetSearchService.h
View File

@ -99,7 +99,7 @@ protected:
static nsIRDFDataSource *mInner; static nsIRDFDataSource *mInner;
static nsCOMPtr<nsIRDFDataSource> mLocalstore; static nsCOMPtr<nsIRDFDataSource> mLocalstore;
static nsCOMPtr<nsISupportsArray> mUpdateArray; static nsCOMPtr<nsISupportsArray> mUpdateArray;
static nsCOMPtr<nsITimer> mTimer; nsCOMPtr<nsITimer> mTimer;
static nsCOMPtr<nsILoadGroup> mBackgroundLoadGroup; static nsCOMPtr<nsILoadGroup> mBackgroundLoadGroup;
static nsCOMPtr<nsILoadGroup> mLoadGroup; static nsCOMPtr<nsILoadGroup> mLoadGroup;
static nsCOMPtr<nsIRDFDataSource> categoryDataSource; static nsCOMPtr<nsIRDFDataSource> categoryDataSource;