зеркало из https://github.com/mozilla/gecko-dev.git
fix for losing junk flags after selecting folder, r/sr/a=sspitzer 191042
This commit is contained in:
Родитель
a3443be3ff
Коммит
6acd0b59e3
|
@ -168,6 +168,8 @@ NS_IMETHODIMP nsImapFlagAndUidState::Reset(PRUint32 howManyLeft)
|
||||||
PR_CEnterMonitor(this);
|
PR_CEnterMonitor(this);
|
||||||
if (!howManyLeft)
|
if (!howManyLeft)
|
||||||
fNumberOfMessagesAdded = fNumberDeleted = 0; // used space is still here
|
fNumberOfMessagesAdded = fNumberDeleted = 0; // used space is still here
|
||||||
|
if (m_customFlagsHash)
|
||||||
|
m_customFlagsHash->Reset(FreeCustomFlags, nsnull);
|
||||||
PR_CExitMonitor(this);
|
PR_CExitMonitor(this);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -352,7 +354,7 @@ imapMessageFlagsType nsImapFlagAndUidState::GetMessageFlagsFromUID(PRUint32 uid,
|
||||||
|
|
||||||
NS_IMETHODIMP nsImapFlagAndUidState::AddUidCustomFlagPair(PRUint32 uid, const char *customFlag)
|
NS_IMETHODIMP nsImapFlagAndUidState::AddUidCustomFlagPair(PRUint32 uid, const char *customFlag)
|
||||||
{
|
{
|
||||||
nsAutoCMonitor(this);
|
nsAutoCMonitor mon(this);
|
||||||
if (!m_customFlagsHash)
|
if (!m_customFlagsHash)
|
||||||
m_customFlagsHash = new nsHashtable(10);
|
m_customFlagsHash = new nsHashtable(10);
|
||||||
if (!m_customFlagsHash)
|
if (!m_customFlagsHash)
|
||||||
|
@ -393,7 +395,7 @@ NS_IMETHODIMP nsImapFlagAndUidState::AddUidCustomFlagPair(PRUint32 uid, const ch
|
||||||
|
|
||||||
NS_IMETHODIMP nsImapFlagAndUidState::GetCustomFlags(PRUint32 uid, char **customFlags)
|
NS_IMETHODIMP nsImapFlagAndUidState::GetCustomFlags(PRUint32 uid, char **customFlags)
|
||||||
{
|
{
|
||||||
nsAutoCMonitor(this);
|
nsAutoCMonitor mon(this);
|
||||||
if (m_customFlagsHash)
|
if (m_customFlagsHash)
|
||||||
{
|
{
|
||||||
nsPRUint32Key hashKey(uid);
|
nsPRUint32Key hashKey(uid);
|
||||||
|
@ -410,7 +412,7 @@ NS_IMETHODIMP nsImapFlagAndUidState::GetCustomFlags(PRUint32 uid, char **customF
|
||||||
|
|
||||||
NS_IMETHODIMP nsImapFlagAndUidState::ClearCustomFlags(PRUint32 uid)
|
NS_IMETHODIMP nsImapFlagAndUidState::ClearCustomFlags(PRUint32 uid)
|
||||||
{
|
{
|
||||||
nsAutoCMonitor(this);
|
nsAutoCMonitor mon(this);
|
||||||
if (m_customFlagsHash)
|
if (m_customFlagsHash)
|
||||||
{
|
{
|
||||||
nsPRUint32Key hashKey(uid);
|
nsPRUint32Key hashKey(uid);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче