Release versions 1.2.11 and 1.2.11-1

[videolink.git] / null_prompt_service.cpp

diff --git a/null_prompt_service.cpp b/null_prompt_service.cpp
index 03355acc10fdef70fff4319a994fc06961912d30..68d6d9010a287cb6189cd93137afb4d54273afe7 100644 (file)
--- a/null_prompt_service.cpp
+++ b/null_prompt_service.cpp
@@ -6,12 +6,15 @@
 
 #include <langinfo.h>
 
 
 #include <langinfo.h>
 

+#include "wchar_t_short.h"

 #include <nsCOMPtr.h>
 #include <nsICharsetConverterManager.h>
 #include <nsIComponentManager.h>
 #include <nsIFactory.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 <nsIUnicodeEncoder.h>

+#include "wchar_t_default.h"

 
 #include "null_prompt_service.hpp"
 #include "videolink.hpp"
 
 #include "null_prompt_service.hpp"
 #include "videolink.hpp"


@@ -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;
     }
     {
        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);
        {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_service_cid,
              "Prompt Service",
              "@mozilla.org/embedcomp/prompt-service;1",

-             prompt_factory,
-             PR_TRUE)); // replace existing
+             prompt_factory));   

 }
 }