X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=null_prompt_service.cpp;h=2548512af320127dd51bee9d00bc8b6e331eee1a;hp=28156d58dcc378743888e1df432fe20a5006aec2;hb=fcc6457245904ddccbeef52a3fc38c18efedf8ac;hpb=3f5baaa4a9097a57f1656f3a38a9cba319019017

diff --git a/null_prompt_service.cpp b/null_prompt_service.cpp
index 28156d5..2548512 100644
--- a/null_prompt_service.cpp
+++ b/null_prompt_service.cpp
@@ -10,12 +10,8 @@
 #include <nsICharsetConverterManager.h>
 #include <nsIComponentManager.h>
 #include <nsIFactory.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 <nsIComponentRegistrar.h>
+#include <nsServiceManagerUtils.h>
 #include <nsIUnicodeEncoder.h>
 
 #include "null_prompt_service.hpp"
@@ -198,21 +194,11 @@ void null_prompt_service::install()
 	{0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}
     };
     nsCOMPtr<nsIFactory> prompt_factory(new null_prompt_service_factory);
-#   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
+    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));	  
 }