From 5bc3a6716d984cc4e7a1b8866dce52ae4c2dd9a1 Mon Sep 17 00:00:00 2001
From: "chanial%noos.fr" <chanial%noos.fr>
Date: Fri, 17 Oct 2003 16:27:55 +0000
Subject: [PATCH] remove #ifdef MOZ_PHOENIX that are no more relevent since we
 forked the bookmarks service. correct typo in comment.

---
 xpfe/components/bookmarks/src/nsBookmarksService.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp
index 2af67b111001..63642a4d0619 100644
--- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp
+++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp
@@ -1819,9 +1819,6 @@ nsBookmarksService::Init()
     if (observerService) {
         observerService->AddObserver(this, "profile-before-change", PR_TRUE);
         observerService->AddObserver(this, "profile-after-change", PR_TRUE);
-#ifdef MOZ_PHOENIX
-        observerService->AddObserver(this, "quit-application", PR_TRUE);
-#endif
     }
 
     rv = initDatasource();
@@ -2571,15 +2568,9 @@ NS_IMETHODIMP nsBookmarksService::Observe(nsISupports *aSubject, const char *aTo
     }    
     else if (mBookmarksFile && !nsCRT::strcmp(aTopic, "profile-after-change"))
     {
-        // The profile has aleady changed.
+        // The profile has already changed.
         rv = LoadBookmarks();
     }
-#ifdef MOZ_PHOENIX
-    else if (!nsCRT::strcmp(aTopic, "quit-application"))
-    {
-        rv = Flush();
-    }
-#endif
     else if (!nsCRT::strcmp(aTopic, "nsPref:changed"))
     {
         rv = Flush();