X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=null_prompt_service.cpp;h=28156d58dcc378743888e1df432fe20a5006aec2;hp=901c5880ce7ebc6affc9a90c65f6a8ab17133cee;hb=194f5f8a53d16a8a07c61df2311a13b3cd3994bf;hpb=5746a18015788678b85907421f91adf249ea71d3

diff --git a/null_prompt_service.cpp b/null_prompt_service.cpp
index 901c588..28156d5 100644
--- a/null_prompt_service.cpp
+++ b/null_prompt_service.cpp
@@ -10,7 +10,12 @@
 #include <nsICharsetConverterManager.h>
 #include <nsIComponentManager.h>
 #include <nsIFactory.h>
-#include <nsIServiceManagerUtils.h>
+#if MOZ_VERSION_MAJOR > 1 || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8)
+#   include <nsIComponentRegistrar.h>
+#   include <nsServiceManagerUtils.h>
+#else
+#   include <nsIServiceManagerUtils.h>
+#endif
 #include <nsIUnicodeEncoder.h>
 
 #include "null_prompt_service.hpp"
@@ -193,10 +198,21 @@ void null_prompt_service::install()
 	{0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}
     };
     nsCOMPtr<nsIFactory> prompt_factory(new null_prompt_service_factory);
-    check(nsComponentManager::RegisterFactory(
-	      prompt_service_cid,
-	      "Prompt Service",
-	      "@mozilla.org/embedcomp/prompt-service;1",
-	      prompt_factory,
-	      PR_TRUE)); // replace existing
+#   if MOZ_VERSION_MAJOR > 1                              \
+    || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8)
+        nsCOMPtr<nsIComponentRegistrar> comp_registrar;
+        check(NS_GetComponentRegistrar(getter_AddRefs(comp_registrar)));
+	check(comp_registrar->RegisterFactory(
+		  prompt_service_cid,
+		  "Prompt Service",
+		  "@mozilla.org/embedcomp/prompt-service;1",
+		  prompt_factory));	  
+#   else
+	check(nsComponentManager::RegisterFactory(
+		  prompt_service_cid,
+		  "Prompt Service",
+		  "@mozilla.org/embedcomp/prompt-service;1",
+		  prompt_factory,
+		  PR_TRUE)); // replace existing
+#   endif
 }