Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 366503: Custom tags broken by junk keywords; r/sr=bienvenu

Browse Source
This commit is contained in:
mnyromyr%tprac.de 2007-02-18 12:31:49 +00:00
parent d04aa717c3
commit 2c8b6e9d34
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mailnews/base/src/nsMsgTagService.cpp
View File

@ -228,8 +228,15 @@ NS_IMETHODIMP nsMsgTagService::GetTopKey(const char * keyList, nsACString & _ret
key = keyArray[i];
if (key->IsEmpty())
continue;
// ignore unknown keywords
nsAutoString tagValue;
nsresult rv = GetTagForKey(*key, tagValue);
if (NS_FAILED(rv) || tagValue.IsEmpty())
continue;
// new top key, judged by ordinal order?
nsresult rv = GetOrdinalForKey(*key, ordinal);
rv = GetOrdinalForKey(*key, ordinal);
if (NS_FAILED(rv) || ordinal.IsEmpty())
ordinal = *key;
if ((ordinal < topOrdinal) || topOrdinal.IsEmpty())
@ -281,9 +288,9 @@ NS_IMETHODIMP nsMsgTagService::AddTag(const nsAString &tag,
while (PR_TRUE)
{
nsAutoString tagValue;
GetUnicharPref(prefName.get(), tagValue);
if (tagValue.IsEmpty() || tagValue.Equals(tag))
return AddTagForKey(key, tag, color, ordinal);
nsresult rv = GetTagForKey(prefName, tagValue);
if (NS_FAILED(rv) || tagValue.IsEmpty() || tagValue.Equals(tag))
return AddTagForKey(prefName, tag, color, ordinal);
prefName.Append('A');
}
NS_ASSERTION(PR_FALSE, "can't get here");