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, 27 insertions, 9 deletions

diff --git a/embed/mozilla/EphyContentPolicy.h b/embed/mozilla/EphyContentPolicy.h
index 52f381a32..96f98374c 100644
--- a/embed/mozilla/EphyContentPolicy.h
+++ b/embed/mozilla/EphyContentPolicy.h
@@ -24,11 +24,16 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gtk/gtkwidget.h>
 
 #include <nsIContentPolicy.h>
 
 #include "ephy-embed.h"
 
+class nsIComponentManager;
+class nsIFile;
+struct nsModuleComponentInfo;
+
 #define EPHY_CONTENT_POLICY_CONTRACTID	"@gnome.org/projects/epiphany/epiphany-content-policy;1"
 #define EPHY_CONTENT_POLICY_CLASSNAME	"Epiphany Content Policy Class"
 
@@ -42,17 +47,30 @@
 
 class EphyContentPolicy : public nsIContentPolicy
 {
-public:
-	NS_DECL_ISUPPORTS
-	NS_DECL_NSICONTENTPOLICY
+  public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSICONTENTPOLICY
 	
-	EphyContentPolicy();
-	virtual ~EphyContentPolicy();
-private:
-	static GtkWidget *GetEmbedFromContext (nsISupports *aContext);
+    EphyContentPolicy();
+
+    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);
+
+  private:
+    ~EphyContentPolicy();
+
+    static GtkWidget *GetEmbedFromContext (nsISupports *aContext);
 
-	gboolean mLocked;
-	GSList *mSafeProtocols;
+    gboolean mLocked;
+    GSList *mSafeProtocols;
 };
 
 #endif