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

diff --git a/null_prompt_service.cpp b/null_prompt_service.cpp
index 28156d5..68d6d90 100644
--- a/null_prompt_service.cpp
+++ b/null_prompt_service.cpp
@@ -6,17 +6,15 @@
 
 #include <langinfo.h>
 
+#include "wchar_t_short.h"
 #include <nsCOMPtr.h>
 #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 "wchar_t_default.h"
 
 #include "null_prompt_service.hpp"
 #include "videolink.hpp"
@@ -198,21 +196,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));	  
 }