зеркало из https://github.com/mozilla/gecko-dev.git
Switch mailnews from prefs.js to prefs50.js
This commit is contained in:
Родитель
bf4f0881c1
Коммит
260026da45
|
@ -47,7 +47,7 @@ nsMsgMailSession::nsMsgMailSession():
|
|||
if (NS_FAILED(rv)) return;
|
||||
|
||||
if (prefs && NS_SUCCEEDED(rv))
|
||||
rv = prefs->Startup("prefs.js");
|
||||
rv = prefs->Startup("prefs50.js");
|
||||
|
||||
(void)nsServiceManager::ReleaseService(kPrefCID, prefs);
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ int main() {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
rv = prefs->Startup("prefs.js");
|
||||
rv = prefs->Startup("prefs50.js");
|
||||
if (NS_FAILED(rv)) printf("Couldn't read prefs\n");
|
||||
|
||||
nsIMsgAccountManager *accountManager;
|
||||
|
|
|
@ -205,7 +205,7 @@ char * INTL_GetDefaultMailCharset()
|
|||
char prefValue[kMAX_CSNAME+1];
|
||||
PRInt32 prefLength = kMAX_CSNAME;
|
||||
|
||||
prefs->Startup("prefs.js");
|
||||
prefs->Startup("prefs50.js");
|
||||
res = prefs->GetCharPref("intl.character_set_name", prefValue, &prefLength);
|
||||
if (NS_SUCCEEDED(res) && prefLength > 0) {
|
||||
//TODO: map to mail charset (e.g. Shift_JIS -> ISO-2022-JP) bug#3941.
|
||||
|
|
|
@ -249,7 +249,7 @@ char * WH_TempName(XP_FileType /*type*/, const char * prefix)
|
|||
res = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&prefs);
|
||||
if (prefs && NS_SUCCEEDED(res))
|
||||
{
|
||||
prefs->Startup("prefs.js");
|
||||
prefs->Startup("prefs50.js");
|
||||
res = prefs->GetCharPref("browser.download_directory", prefValue, &prefLength);
|
||||
if (NS_SUCCEEDED(res) && prefLength > 0)
|
||||
tempPath = PL_strdup(prefValue);
|
||||
|
|
|
@ -2476,7 +2476,7 @@ nsresult nsMsgDatabase::GetBoolPref(const char *prefName, PRBool *result)
|
|||
rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&prefs);
|
||||
if (prefs && NS_SUCCEEDED(rv))
|
||||
{
|
||||
// prefs->Startup("prefs.js");
|
||||
// prefs->Startup("prefs50.js");
|
||||
|
||||
rv = prefs->GetBoolPref(prefName, &prefValue);
|
||||
*result = prefValue;
|
||||
|
|
|
@ -313,7 +313,7 @@ void nsMailboxTestDriver::InitializeTestDriver()
|
|||
rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&prefs);
|
||||
if (prefs && NS_SUCCEEDED(rv))
|
||||
{
|
||||
prefs->Startup("prefs.js");
|
||||
prefs->Startup("prefs50.js");
|
||||
rv = prefs->GetCharPref(kMsgRootFolderPref, rootPath, &rootLen);
|
||||
nsServiceManager::ReleaseService(kPrefCID, prefs);
|
||||
}
|
||||
|
|
|
@ -85,7 +85,7 @@ printf("Prefs not working on multiple threads...must find a solution\n");
|
|||
nsresult rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&(mPrefs));
|
||||
if (! (mPrefs && NS_SUCCEEDED(rv)))
|
||||
return;
|
||||
mPrefs->Startup("prefs.js");
|
||||
mPrefs->Startup("prefs50.js");
|
||||
|
||||
// mPrefs->GetIntPref("mail.show_headers", &mHeaderDisplayType);
|
||||
}
|
||||
|
|
|
@ -89,7 +89,7 @@ printf("Prefs not working on multiple threads...must find a solution\n");
|
|||
nsresult rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&(mPrefs));
|
||||
if (! (mPrefs && NS_SUCCEEDED(rv)))
|
||||
return;
|
||||
mPrefs->Startup("prefs.js");
|
||||
mPrefs->Startup("prefs50.js");
|
||||
|
||||
mPrefs->GetIntPref("mail.show_headers", &mHeaderDisplayType);
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ extern "C" {
|
|||
#include "mimei.h"
|
||||
#include "nsIPref.h"
|
||||
|
||||
#define MIME_PREFS_FILE "prefs.js"
|
||||
#define MIME_PREFS_FILE "prefs50.js"
|
||||
|
||||
typedef struct _nsMIMESession nsMIMESession;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче