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

Fixing bugscape bug 4198. This fix allows ISPs add signature files to the user accounts. Adding changes to AppFileLocationProvider to get to messenger defaults.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@102979 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
racham%netscape.com
2001-09-15 07:53:54 +00:00
parent 0260babdad
commit af481b9a4d
3 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/xpcom/io/nsAppFileLocationProvider.cpp
View File

@@ -29,6 +29,7 @@
#include "nsILocalFile.h"
#include "nsString.h"
#include "nsXPIDLString.h"
#include "nsIChromeRegistry.h"
#if defined(XP_MAC)
@@ -94,6 +95,8 @@
#define SEARCH_DIR_NAME "searchplugins"
#endif
// default mailnews files parent folder
#define MESSENGER_DIR_NAME "messenger"
//*****************************************************************************
// nsAppFileLocationProvider::Constructor/Destructor
@@ -108,6 +111,8 @@ nsAppFileLocationProvider::~nsAppFileLocationProvider()
{
}
// Chrome reg service
static NS_DEFINE_CID(kChromeRegistryCID, NS_CHROMEREGISTRY_CID);
//*****************************************************************************
// nsAppFileLocationProvider::nsISupports
@@ -191,6 +196,18 @@ nsAppFileLocationProvider::GetFile(const char *prop, PRBool *persistant, nsIFile
if (NS_SUCCEEDED(rv))
rv = localFile->AppendRelativePath(SEARCH_DIR_NAME);
}
else if (nsCRT::strcmp(prop, NS_APP_MESSENGER_DIR) == 0)
{
rv = CloneMozBinDirectory(getter_AddRefs(localFile));
if (NS_SUCCEEDED(rv)) {
rv = localFile->AppendRelativePath(DEFAULTS_DIR_NAME);
if (NS_SUCCEEDED(rv)) {
rv = localFile->AppendRelativePath(MESSENGER_DIR_NAME);
if (NS_SUCCEEDED(rv))
rv = GetSelectedLocaleDataDir(localFile);
}
}
}
if (localFile && NS_SUCCEEDED(rv))
return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval);
@@ -349,3 +366,40 @@ NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsILocalFile **aL
return rv;
}
//----------------------------------------------------------------------------------------
// GetSelectedLocaleDataDir - If a locale is selected, appends the selected locale to the
// defaults data dir and returns that new defaults data dir
//----------------------------------------------------------------------------------------
NS_METHOD nsAppFileLocationProvider::GetSelectedLocaleDataDir(nsILocalFile *defaultsDataDir)
{
NS_ENSURE_ARG_POINTER(defaultsDataDir);
nsresult rv;
PRBool baseDirExists = PR_FALSE;
rv = defaultsDataDir->Exists(&baseDirExists);
NS_ENSURE_SUCCESS(rv,rv);
if (baseDirExists) {
nsCOMPtr<nsIChromeRegistry> chromeRegistry = do_GetService(kChromeRegistryCID, &rv);
if (NS_SUCCEEDED(rv)) {
nsXPIDLString localeName;
nsAutoString regionKey; regionKey.AssignWithConversion("global-region");
rv = chromeRegistry->GetSelectedLocale(regionKey.get(), getter_Copies(localeName));
if (NS_SUCCEEDED(rv) && + localeName.get() && + nsCRT::strlen(localeName.get())) {
PRBool localeDirExists = PR_FALSE;
nsCOMPtr<nsIFile> localeDataDir;
rv = defaultsDataDir->Clone(getter_AddRefs(localeDataDir));
NS_ENSURE_SUCCESS(rv,rv);
rv = localeDataDir->AppendUnicode(localeName);
NS_ENSURE_SUCCESS(rv,rv);
rv = localeDataDir->Exists(&localeDirExists);
NS_ENSURE_SUCCESS(rv,rv);
if (localeDirExists) {
// use locale provider instead
rv = defaultsDataDir->AppendUnicode(localeName);
NS_ENSURE_SUCCESS(rv,rv);
}
}
}
}
return NS_OK;
}