329169 - leaked livemark service on shutdown... break cycle with load channels by canceling loads on xpcom-shutdown rather than in the livemark service's dtor, which will never fire due to circular references. r=bryner

Original committer: beng%bengoodger.com
Original revision: 1.7
Original date: 2006/03/03 05:14:34

toolkit/components/places/src/nsLivemarkService.h

@@ -42,6 +42,7 @@
 #include "nsNavHistory.h"
 #include "nsBrowserCompsCID.h"
 #include "nsILoadGroup.h"
+#include "nsIObserver.h"
 
 // Constants for livemark annotations
 #define LMANNO_FEEDURI     "livemark/feedURI"
@@ -49,12 +50,13 @@
 #define LMANNO_EXPIRATION  "livemark/expiration"
 #define LMANNO_BMANNO      "livemark/bookmarkFeedURI"
 
-class nsLivemarkService : public nsILivemarkService
+class nsLivemarkService : public nsILivemarkService, public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIREMOTECONTAINER
   NS_DECL_NSILIVEMARKSERVICE
+  NS_DECL_NSIOBSERVER
 
   nsLivemarkService();
   nsresult Init();