Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change how we detect if xpcom was initialized. Not part of the build.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@199022 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au 2006-06-05 07:22:27 +00:00
parent a85698177b
commit 17f5928f9f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/extensions/python/xpcom/src/module/_xpcom.cpp
View File

@ -51,8 +51,8 @@
#include "nsIFile.h"
#include "nsIComponentRegistrar.h"
#include "nsIConsoleService.h"
#include "nsDirectoryServiceDefs.h"
//#include "nsThreadManager.h"
#include "nsILocalFile.h"
#include "nsTraceRefcntImpl.h"
@ -475,12 +475,12 @@ static PRBool EnsureXPCOM()
{
static PRBool bHaveInitXPCOM = PR_FALSE;
if (!bHaveInitXPCOM) {
/***
// xpcom appears to assert if already initialized
// Is there an official way to determine this?
nsThreadManager *mgr = nsThreadManager::get();
nsCOMPtr<nsIThread> thread_check;
if (!mgr || NS_FAILED(mgr->GetMainThread(getter_AddRefs(thread_check)))) {
// Been through lots of iterations - but getting the
// app directories appears to work.
nsCOMPtr<nsIFile> file;
if (NS_FAILED(NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(file)))) {
// not already initialized.
#ifdef XP_WIN
// On Windows, we need to locate the Mozilla bin
@ -523,7 +523,6 @@ static PRBool EnsureXPCOM()
return PR_FALSE;
}
}
***/
// Even if xpcom was already init, we want to flag it as init!
bHaveInitXPCOM = PR_TRUE;
}