Fix a warning from gecko "Bad contract id registed with the script

2006-06-23  Jean-François Rameau  <jframeau@cvs.gnome.org>

	* embed/mozilla/MozRegisterComponents.cpp: (mozilla_register_components):

	Fix a warning from gecko "Bad contract id registed with the script namespace manager".
	Only unregister xpinstall factory with gecko >= 1.9.

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b99c077e3..07b512bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-23  Jean-François Rameau  <jframeau@cvs.gnome.org>
+
+	* embed/mozilla/MozRegisterComponents.cpp: (mozilla_register_components):
+
+	Fix a warning from gecko "Bad contract id registed with the script namespace manager".
+	Only unregister xpinstall factory with gecko >= 1.9.
+
 2006-06-22  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index 0ec74ff17..1c93ebeed 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -333,6 +333,7 @@ mozilla_register_components (void)
 	rv = RegisterCategories();
 	ret = NS_SUCCEEDED (rv); 
 
+#ifdef HAVE_GECKO_1_9
 	/* Unregister xpinstall content handler */
 	nsCID *cidPtr = nsnull;
 	rv = cr->ContractIDToCID (XPINSTALL_CONTRACTID, &cidPtr);
@@ -352,6 +353,7 @@ mozilla_register_components (void)
 	{
 		g_warning ("Failed to unregister xpinstall content handler!\n");
 	}
+#endif
 
 	return ret;
 }