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

Bug 342065: fix AddTagForKey; r/sr=bienvenu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@211877 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mnyromyr%tprac.de 2006-09-17 01:30:48 +00:00
parent dbdb7d253b
commit e35caa3b35
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/mailnews/base/src/nsMsgTagService.cpp
View File

@ -247,17 +247,11 @@ NS_IMETHODIMP nsMsgTagService::AddTagForKey(const nsACString &key,
{
nsCAutoString prefName(key);
prefName.AppendLiteral(TAG_PREF_SUFFIX_TAG);
SetUnicharPref(prefName.get(), tag);
prefName.Replace(prefName.Length() - STRLEN(TAG_PREF_SUFFIX_TAG),
STRLEN(TAG_PREF_SUFFIX_TAG),
NS_LITERAL_CSTRING(TAG_PREF_SUFFIX_COLOR));
m_prefBranch->SetCharPref(prefName.get(), PromiseFlatCString(color).get());
prefName.Replace(prefName.Length() - STRLEN(TAG_PREF_SUFFIX_COLOR),
STRLEN(TAG_PREF_SUFFIX_COLOR),
NS_LITERAL_CSTRING(TAG_PREF_SUFFIX_ORDINAL));
if (prefName.IsEmpty())
return m_prefBranch->ClearUserPref(prefName.get());
return m_prefBranch->SetCharPref(prefName.get(), PromiseFlatCString(ordinal).get());
nsresult rv = SetUnicharPref(prefName.get(), tag);
NS_ENSURE_SUCCESS(rv, rv);
rv = SetColorForKey(key, color);
NS_ENSURE_SUCCESS(rv, rv);
return SetOrdinalForKey(key, ordinal);
}
/* void addTag (in wstring tag, in long color); */
@ -301,10 +295,13 @@ NS_IMETHODIMP nsMsgTagService::GetColorForKey(const nsACString &key, nsACString
/* void setColorForKey (in ACString key, in ACString color); */
NS_IMETHODIMP nsMsgTagService::SetColorForKey(const nsACString & key, const nsACString & color)
{
if (color.IsEmpty())
return NS_ERROR_ILLEGAL_VALUE;
nsCAutoString prefName(key);
prefName.AppendLiteral(TAG_PREF_SUFFIX_COLOR);
if (color.IsEmpty())
{
m_prefBranch->ClearUserPref(prefName.get());
return NS_OK;
}
return m_prefBranch->SetCharPref(prefName.get(), PromiseFlatCString(color).get());
}
@ -325,7 +322,10 @@ NS_IMETHODIMP nsMsgTagService::SetOrdinalForKey(const nsACString & key, const ns
nsCAutoString prefName(key);
prefName.AppendLiteral(TAG_PREF_SUFFIX_ORDINAL);
if (ordinal.IsEmpty())
return m_prefBranch->ClearUserPref(prefName.get());
{
m_prefBranch->ClearUserPref(prefName.get());
return NS_OK;
}
return m_prefBranch->SetCharPref(prefName.get(), PromiseFlatCString(ordinal).get());
}