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

Changed GetCharacterSet to return a default if no folder charset is stored, bug 46542, r=bienvenu.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@75427 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nhotta%netscape.com
2000-08-02 22:07:47 +00:00
parent e0ca215d75
commit 9792e2e21e
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
View File

@@ -25,6 +25,7 @@
#include "nsDBFolderInfo.h"
#include "nsMsgDatabase.h"
#include "nsMsgFolderFlags.h"
#include "nsIPref.h"
static const char *kDBFolderInfoScope = "ns:msg:db:row:scope:dbfolderinfo:all";
static const char *kDBFolderInfoTableKind = "ns:msg:db:table:kind:dbfolderinfo";
@@ -50,6 +51,8 @@ static const char * kVersionColumnName = "version";
static const char * kCharacterSetColumnName = "charSet";
static const char * kLocaleColumnName = "locale";
static nsString gDefaultCharacterSet; // default charset
NS_IMPL_ADDREF(nsDBFolderInfo)
NS_IMPL_RELEASE(nsDBFolderInfo)
@@ -102,6 +105,23 @@ nsDBFolderInfo::nsDBFolderInfo(nsMsgDatabase *mdb)
m_mdbTokensInitialized = FALSE;
// Initialize a default charset to a pref default.
if (gDefaultCharacterSet.IsEmpty())
{
nsresult rv;
nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_PROGID, &rv);
if (NS_SUCCEEDED(rv))
{
PRUnichar *prefCharset = nsnull;
rv = prefs->GetLocalizedUnicharPref("mailnews.view_default_charset", &prefCharset);
if (NS_SUCCEEDED(rv))
{
gDefaultCharacterSet.Assign(prefCharset);
PR_Free(prefCharset);
}
}
}
if (mdb)
{
mdb_err err;
@@ -552,7 +572,12 @@ PRBool nsDBFolderInfo::TestFlag(PRInt32 flags)
NS_IMETHODIMP
nsDBFolderInfo::GetCharacterSet(nsString *result)
{
return GetProperty(kCharacterSetColumnName, result);
nsresult rv = GetProperty(kCharacterSetColumnName, result);
if (NS_SUCCEEDED(rv) && result->IsEmpty())
result->Assign(gDefaultCharacterSet.GetUnicode());
return rv;
}
NS_IMETHODIMP