mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 478218 - onQuit expiration is not working, changes are never synced to disk, r=dietrich a=blocking191
This commit is contained in:
parent
8b31027ba9
commit
4662ddb1aa
@ -329,7 +329,7 @@ const PRInt32 nsNavHistory::kAutoCompleteBehaviorTitle = 1 << 3;
|
|||||||
const PRInt32 nsNavHistory::kAutoCompleteBehaviorUrl = 1 << 4;
|
const PRInt32 nsNavHistory::kAutoCompleteBehaviorUrl = 1 << 4;
|
||||||
const PRInt32 nsNavHistory::kAutoCompleteBehaviorTyped = 1 << 5;
|
const PRInt32 nsNavHistory::kAutoCompleteBehaviorTyped = 1 << 5;
|
||||||
|
|
||||||
static const char* gQuitApplicationMessage = "quit-application";
|
static const char* gQuitApplicationGrantedMessage = "quit-application-granted";
|
||||||
static const char* gXpcomShutdown = "xpcom-shutdown";
|
static const char* gXpcomShutdown = "xpcom-shutdown";
|
||||||
static const char* gAutoCompleteFeedback = "autocomplete-will-enter-text";
|
static const char* gAutoCompleteFeedback = "autocomplete-will-enter-text";
|
||||||
static const char* gIdleDaily = "idle-daily";
|
static const char* gIdleDaily = "idle-daily";
|
||||||
@ -521,7 +521,7 @@ nsNavHistory::Init()
|
|||||||
pbi->AddObserver(PREF_BROWSER_HISTORY_EXPIRE_SITES, this, PR_FALSE);
|
pbi->AddObserver(PREF_BROWSER_HISTORY_EXPIRE_SITES, this, PR_FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
observerService->AddObserver(this, gQuitApplicationMessage, PR_FALSE);
|
observerService->AddObserver(this, gQuitApplicationGrantedMessage, PR_FALSE);
|
||||||
observerService->AddObserver(this, gXpcomShutdown, PR_FALSE);
|
observerService->AddObserver(this, gXpcomShutdown, PR_FALSE);
|
||||||
observerService->AddObserver(this, gAutoCompleteFeedback, PR_FALSE);
|
observerService->AddObserver(this, gAutoCompleteFeedback, PR_FALSE);
|
||||||
observerService->AddObserver(this, gIdleDaily, PR_FALSE);
|
observerService->AddObserver(this, gIdleDaily, PR_FALSE);
|
||||||
@ -5326,7 +5326,7 @@ nsNavHistory::Observe(nsISupports *aSubject, const char *aTopic,
|
|||||||
{
|
{
|
||||||
NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
|
NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
|
||||||
|
|
||||||
if (strcmp(aTopic, gQuitApplicationMessage) == 0) {
|
if (strcmp(aTopic, gQuitApplicationGrantedMessage) == 0) {
|
||||||
if (mIdleTimer) {
|
if (mIdleTimer) {
|
||||||
mIdleTimer->Cancel();
|
mIdleTimer->Cancel();
|
||||||
mIdleTimer = nsnull;
|
mIdleTimer = nsnull;
|
||||||
@ -5358,7 +5358,7 @@ nsNavHistory::Observe(nsISupports *aSubject, const char *aTopic,
|
|||||||
observerService->RemoveObserver(this, gIdleDaily);
|
observerService->RemoveObserver(this, gIdleDaily);
|
||||||
observerService->RemoveObserver(this, gAutoCompleteFeedback);
|
observerService->RemoveObserver(this, gAutoCompleteFeedback);
|
||||||
observerService->RemoveObserver(this, gXpcomShutdown);
|
observerService->RemoveObserver(this, gXpcomShutdown);
|
||||||
observerService->RemoveObserver(this, gQuitApplicationMessage);
|
observerService->RemoveObserver(this, gQuitApplicationGrantedMessage);
|
||||||
}
|
}
|
||||||
#ifdef MOZ_XUL
|
#ifdef MOZ_XUL
|
||||||
else if (strcmp(aTopic, gAutoCompleteFeedback) == 0) {
|
else if (strcmp(aTopic, gAutoCompleteFeedback) == 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user