Remove ill-conceived attempt at uninstalling the XPInstall handler, and

2006-09-16  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/EphyContentPolicy.cpp:
	* embed/mozilla/EphyContentPolicy.h:
	* embed/mozilla/EphySidebar.cpp:
	* embed/mozilla/EphySidebar.h:
	* embed/mozilla/MozRegisterComponents.cpp:

	Remove ill-conceived attempt at uninstalling the XPInstall handler,
	and move category registration to the classes that are being
	registered.

1 files changed, 20 insertions, 4 deletions

diff --git a/embed/mozilla/EphySidebar.h b/embed/mozilla/EphySidebar.h
index be611d486..1eca053cb 100644
--- a/embed/mozilla/EphySidebar.h
+++ b/embed/mozilla/EphySidebar.h
@@ -24,6 +24,10 @@
 
 #include <nsISidebar.h>
 
+class nsIComponentManager;
+class nsIFile;
+struct nsModuleComponentInfo;
+
 #define EPHY_SIDEBAR_CLASSNAME \
  "Epiphany's Sidebar Implementation"
 
@@ -38,12 +42,24 @@
 class EphySidebar : public nsISidebar
 {
   public:
-	NS_DECL_ISUPPORTS
-	NS_DECL_NSISIDEBAR
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSISIDEBAR
+
+    EphySidebar();
+
+    static NS_METHOD Register (nsIComponentManager* aComponentManager,
+			       nsIFile* aPath,
+			       const char* aRegistryLocation,
+			       const char* aComponentType,
+			       const nsModuleComponentInfo* aInfo);
+
+    static NS_METHOD Unregister (nsIComponentManager* aComponentManager,
+				 nsIFile* aPath,
+				 const char* aRegistryLocation,
+				 const nsModuleComponentInfo* aInfo);
 
-	EphySidebar();
-	virtual ~EphySidebar();
   private:
+    ~EphySidebar();
 };
 
 #endif /* ! EPHY_SIDEBAR_H */