зеркало из https://github.com/mozilla/gecko-dev.git
fix priority enum names
This commit is contained in:
Родитель
4c4d190029
Коммит
8a4994d751
|
@ -20,6 +20,7 @@
|
||||||
#include "nsMsgHdr.h"
|
#include "nsMsgHdr.h"
|
||||||
#include "nsMsgDatabase.h"
|
#include "nsMsgDatabase.h"
|
||||||
#include "nsString2.h"
|
#include "nsString2.h"
|
||||||
|
#include "nsMsgUtils.h"
|
||||||
|
|
||||||
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
|
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
|
||||||
// that doesn't allow you to call ::nsISupports::GetIID() inside of a class
|
// that doesn't allow you to call ::nsISupports::GetIID() inside of a class
|
||||||
|
@ -423,9 +424,13 @@ NS_IMETHODIMP nsMsgHdr::GetLineCount(PRUint32 *result)
|
||||||
|
|
||||||
NS_IMETHODIMP nsMsgHdr::SetPriority(const char *priority)
|
NS_IMETHODIMP nsMsgHdr::SetPriority(const char *priority)
|
||||||
{
|
{
|
||||||
// ### TODO
|
|
||||||
// m_priority = MSG_GetPriorityFromString(priority);
|
// m_priority = MSG_GetPriorityFromString(priority);
|
||||||
return SetPriority(nsMsgPriority_Normal);
|
nsMsgPriority priorityVal = nsMsgPriorityNormal;
|
||||||
|
|
||||||
|
// NS_MsgGetPriorityFromString will return normal in case of error,
|
||||||
|
// so we can ignore return value.
|
||||||
|
nsresult res = NS_MsgGetPriorityFromString(priority, &priorityVal);
|
||||||
|
return SetPriority(priorityVal);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP nsMsgHdr::GetAuthor(nsString &resultAuthor)
|
NS_IMETHODIMP nsMsgHdr::GetAuthor(nsString &resultAuthor)
|
||||||
|
|
|
@ -976,7 +976,7 @@ int nsParseMailMessageState::FinalizeHeaders()
|
||||||
const char *s;
|
const char *s;
|
||||||
PRUint32 flags = 0;
|
PRUint32 flags = 0;
|
||||||
PRUint32 delta = 0;
|
PRUint32 delta = 0;
|
||||||
nsMsgPriority priorityFlags = nsMsgPriority_NotSet;
|
nsMsgPriority priorityFlags = nsMsgPriorityNotSet;
|
||||||
|
|
||||||
if (!m_mailDB) // if we don't have a valid db, skip the header.
|
if (!m_mailDB) // if we don't have a valid db, skip the header.
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1056,7 +1056,7 @@ int nsParseMailMessageState::FinalizeHeaders()
|
||||||
flags |= MSG_FLAG_MDN_REPORT_NEEDED;
|
flags |= MSG_FLAG_MDN_REPORT_NEEDED;
|
||||||
|
|
||||||
m_newMsgHdr->SetFlags(flags);
|
m_newMsgHdr->SetFlags(flags);
|
||||||
if (priorityFlags != nsMsgPriority_NotSet)
|
if (priorityFlags != nsMsgPriorityNotSet)
|
||||||
m_newMsgHdr->SetPriority(priorityFlags);
|
m_newMsgHdr->SetPriority(priorityFlags);
|
||||||
|
|
||||||
if (delta < 0xffff)
|
if (delta < 0xffff)
|
||||||
|
@ -1198,8 +1198,8 @@ int nsParseMailMessageState::FinalizeHeaders()
|
||||||
}
|
}
|
||||||
if (priority)
|
if (priority)
|
||||||
m_newMsgHdr->SetPriority(priority->value);
|
m_newMsgHdr->SetPriority(priority->value);
|
||||||
else if (priorityFlags == nsMsgPriority_NotSet)
|
else if (priorityFlags == nsMsgPriorityNotSet)
|
||||||
m_newMsgHdr->SetPriority(nsMsgPriority_None);
|
m_newMsgHdr->SetPriority(nsMsgPriorityNone);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -48,13 +48,13 @@ const nsMsgViewIndex nsMsgViewIndex_None = 0xFFFFFFFF;
|
||||||
|
|
||||||
/* Message priorities as determined by X-Priority hdr, or Priority header? */
|
/* Message priorities as determined by X-Priority hdr, or Priority header? */
|
||||||
enum nsMsgPriority {
|
enum nsMsgPriority {
|
||||||
nsMsgPriority_NotSet = 0,
|
nsMsgPriorityNotSet = 0,
|
||||||
nsMsgPriority_None = 1,
|
nsMsgPriorityNone = 1,
|
||||||
nsMsgPriority_Lowest,
|
nsMsgPriorityLowest,
|
||||||
nsMsgPriority_Low,
|
nsMsgPriorityLow,
|
||||||
nsMsgPriority_Normal,
|
nsMsgPriorityNormal,
|
||||||
nsMsgPriority_High,
|
nsMsgPriorityHigh,
|
||||||
nsMsgPriority_Highest
|
nsMsgPriorityHighest
|
||||||
};
|
};
|
||||||
|
|
||||||
// The following enums are all persistent in databases, so don't go changing the values!
|
// The following enums are all persistent in databases, so don't go changing the values!
|
||||||
|
|
Загрузка…
Ссылка в новой задаче