X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=null_prompt_service.cpp;h=68d6d9010a287cb6189cd93137afb4d54273afe7;hb=588553096cd61ef36c1bc6ab6133764a608b0ef3;hp=37303c054a089211e373c4158d5de66f7af8b439;hpb=6e994af0a7e236de8d3e4dbfed0219f7fc3e1dbf;p=videolink.git

diff --git a/null_prompt_service.cpp b/null_prompt_service.cpp
index 37303c0..68d6d90 100644
--- a/null_prompt_service.cpp
+++ b/null_prompt_service.cpp
@@ -6,15 +6,18 @@
 
 #include <langinfo.h>
 
+#include "wchar_t_short.h"
 #include <nsCOMPtr.h>
 #include <nsICharsetConverterManager.h>
 #include <nsIComponentManager.h>
 #include <nsIFactory.h>
-#include <nsIServiceManagerUtils.h>
+#include <nsIComponentRegistrar.h>
+#include <nsServiceManagerUtils.h>
 #include <nsIUnicodeEncoder.h>
+#include "wchar_t_default.h"
 
 #include "null_prompt_service.hpp"
-#include "webdvd.hpp"
+#include "videolink.hpp"
 #include "xpcom_support.hpp"
 
 using xpcom_support::check;
@@ -50,7 +53,7 @@ namespace
 	}
     }
 
-    NS_IMETHODIMP null_prompt_service_factory::LockFactory(PRBool lock)
+    NS_IMETHODIMP null_prompt_service_factory::LockFactory(PRBool /*lock*/)
     {
 	return NS_ERROR_NOT_IMPLEMENTED;
     }
@@ -193,10 +196,11 @@ 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(
+    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,
-	      PR_TRUE)); // replace existing
+	      prompt_factory));	  
 }