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

Unix: Autoregistration disabled at initialization. This should be done by app.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@23801 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dp%netscape.com 1999-03-12 00:05:54 +00:00
parent dd245a35ba
commit 5915fbf7df
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/xpcom/components/nsComponentManager.cpp
View File

@ -220,8 +220,11 @@ nsresult nsComponentManagerImpl::Init(void)
PlatformVersionCheck();
#endif
// Initiate autoreg
#if !defined(XP_UNIX)
// The below code is being moved out into the applications using using
// nsSpecialSystemDirectory platform by platform.
AutoRegister(NS_Startup, NULL);
#endif /* !XP_UNIX */
return NS_OK;
}
@ -1575,7 +1578,9 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
{
SyncComponentsInPathList(pathlist);
}
#if !defined(XP_UNIX)
// The below code is being moved out into the applications using using
// nsSpecialSystemDirectory platform by platform.
#ifdef XP_MAC
// get info for the the current process to determine the directory its located in
if (!(err = GetCurrentProcess(&psn)))
@ -1628,6 +1633,7 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
const char *defaultPathList = "./components";
SyncComponentsInPathList(defaultPathList);
#endif
#endif /* !XP_UNIX */
return NS_OK;
}

3
mozilla/xpcom/components/nsComponentManager.h
View File

@ -198,7 +198,6 @@ protected:
#define NS_MOZILLA_DIR_PERMISSION 00700
#endif /* XP_UNIX */
/**
* When using the registry we put a version number in it.
* If the version number that is in the registry doesn't match
@ -209,7 +208,7 @@ protected:
* alpha0.30 : Changing autoreg to begin registration from ./components on unix
* alpha0.40 : repository -> component manager
*/
#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.42"
#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.43"
////////////////////////////////////////////////////////////////////////////////
/**

10
mozilla/xpcom/src/nsComponentManager.cpp
View File

@ -220,8 +220,11 @@ nsresult nsComponentManagerImpl::Init(void)
PlatformVersionCheck();
#endif
// Initiate autoreg
#if !defined(XP_UNIX)
// The below code is being moved out into the applications using using
// nsSpecialSystemDirectory platform by platform.
AutoRegister(NS_Startup, NULL);
#endif /* !XP_UNIX */
return NS_OK;
}
@ -1575,7 +1578,9 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
{
SyncComponentsInPathList(pathlist);
}
#if !defined(XP_UNIX)
// The below code is being moved out into the applications using using
// nsSpecialSystemDirectory platform by platform.
#ifdef XP_MAC
// get info for the the current process to determine the directory its located in
if (!(err = GetCurrentProcess(&psn)))
@ -1628,6 +1633,7 @@ nsComponentManagerImpl::AutoRegister(RegistrationTime when,
const char *defaultPathList = "./components";
SyncComponentsInPathList(defaultPathList);
#endif
#endif /* !XP_UNIX */
return NS_OK;
}

3
mozilla/xpcom/src/nsComponentManager.h
View File

@ -198,7 +198,6 @@ protected:
#define NS_MOZILLA_DIR_PERMISSION 00700
#endif /* XP_UNIX */
/**
* When using the registry we put a version number in it.
* If the version number that is in the registry doesn't match
@ -209,7 +208,7 @@ protected:
* alpha0.30 : Changing autoreg to begin registration from ./components on unix
* alpha0.40 : repository -> component manager
*/
#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.42"
#define NS_XPCOM_COMPONENT_MANAGER_VERSION_STRING "alpha0.43"
////////////////////////////////////////////////////////////////////////////////
/**