mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug #379070 --> more string cleanup work for mailnews in preparation of moving to frozen linkage. 

r=prasad
This commit is contained in:
scott%scott-macgregor.org 2007-06-11 00:05:30 +00:00
Родитель 8645c31058
Коммит 1b84d653ac
22 изменённых файлов: 1054 добавлений и 1115 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
mailnews/addrbook/src/nsAbAutoCompleteSession.h
Просмотреть файл

@ -156,13 +156,13 @@ public:
virtual ~nsAbAutoCompleteParam()
{
CRTFREEIF(mNickName);
CRTFREEIF(mDisplayName);
CRTFREEIF(mFirstName);
CRTFREEIF(mLastName);
CRTFREEIF(mEmailAddress);
CRTFREEIF(mNotes);
CRTFREEIF(mDirName);
NS_Free(mNickName);
NS_Free(mDisplayName);
NS_Free(mFirstName);
NS_Free(mLastName);
NS_Free(mEmailAddress);
NS_Free(mNotes);
NS_Free(mDirName);
};
protected:

174
mailnews/addrbook/src/nsAbCardProperty.cpp
Просмотреть файл

@ -38,7 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "nsAbCardProperty.h"
#include "nsAbCardProperty.h"
#include "nsIServiceManager.h"
#include "nsString.h"
#include "nsAbBaseCID.h"
@ -78,45 +78,45 @@ struct AppendItem {
EAppendType mAppendType;
};
static const AppendItem NAME_ATTRS_ARRAY[] = {
{kDisplayNameColumn, "propertyDisplayName", eAppendLabel},
static const AppendItem NAME_ATTRS_ARRAY[] = {
{kDisplayNameColumn, "propertyDisplayName", eAppendLabel},
{kNicknameColumn, "propertyNickname", eAppendLabel},
{kPriEmailColumn, "", eAppendLine},
{kPriEmailColumn, "", eAppendLine},
{k2ndEmailColumn, "", eAppendLine},
{kAimScreenNameColumn, "propertyScreenName", eAppendLabel},
};
static const AppendItem PHONE_ATTRS_ARRAY[] = {
{kWorkPhoneColumn, "propertyWork", eAppendLabel},
static const AppendItem PHONE_ATTRS_ARRAY[] = {
{kWorkPhoneColumn, "propertyWork", eAppendLabel},
{kHomePhoneColumn, "propertyHome", eAppendLabel},
{kFaxColumn, "propertyFax", eAppendLabel},
{kFaxColumn, "propertyFax", eAppendLabel},
{kPagerColumn, "propertyPager", eAppendLabel},
{kCellularColumn, "propertyCellular", eAppendLabel}
};
static const AppendItem HOME_ATTRS_ARRAY[] = {
{kHomeAddressColumn, "", eAppendLine},
static const AppendItem HOME_ATTRS_ARRAY[] = {
{kHomeAddressColumn, "", eAppendLine},
{kHomeAddress2Column, "", eAppendLine},
{kHomeCityColumn, "", eAppendCityStateZip},
{kHomeCityColumn, "", eAppendCityStateZip},
{kHomeCountryColumn, "", eAppendLine},
{kWebPage2Column, "", eAppendLine}
};
static const AppendItem WORK_ATTRS_ARRAY[] = {
{kJobTitleColumn, "", eAppendLine},
static const AppendItem WORK_ATTRS_ARRAY[] = {
{kJobTitleColumn, "", eAppendLine},
{kDepartmentColumn, "", eAppendLine},
{kCompanyColumn, "", eAppendLine},
{kWorkAddressColumn, "", eAppendLine},
{kWorkAddressColumn, "", eAppendLine},
{kWorkAddress2Column, "", eAppendLine},
{kWorkCityColumn, "", eAppendCityStateZip},
{kWorkCityColumn, "", eAppendCityStateZip},
{kWorkCountryColumn, "", eAppendLine},
{kWebPage1Column, "", eAppendLine}
};
static const AppendItem CUSTOM_ATTRS_ARRAY[] = {
{kCustom1Column, "propertyCustom1", eAppendLabel},
static const AppendItem CUSTOM_ATTRS_ARRAY[] = {
{kCustom1Column, "propertyCustom1", eAppendLabel},
{kCustom2Column, "propertyCustom2", eAppendLabel},
{kCustom3Column, "propertyCustom3", eAppendLabel},
{kCustom3Column, "propertyCustom3", eAppendLabel},
{kCustom4Column, "propertyCustom4", eAppendLabel},
{kNotesColumn, "", eAppendLine}
};
@ -165,7 +165,7 @@ NS_IMETHODIMP nsAbCardProperty::SetAllowRemoteContent(PRBool aAllowRemoteContent
NS_IMETHODIMP nsAbCardProperty::GetPreferMailFormat(PRUint32 *aFormat)
{
*aFormat = m_PreferMailFormat;
*aFormat = m_PreferMailFormat;
return NS_OK;
}
@ -300,11 +300,11 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
}
break;
case 'D':
if (attrname[1] == 'i')
if (attrname[1] == 'i')
rv = GetDisplayName(value);
else if (attrname[2] == 'f')
rv = GetDefaultAddress(value);
else
else
rv = GetDepartment(value);
break;
case 'F':
@ -331,13 +331,13 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
case 'A':
if (attrname[11] == '\0')
rv = GetHomeAddress(value);
else
else
rv = GetHomeAddress2(value);
break;
case 'C':
if (attrname[5] == 'i')
rv = GetHomeCity(value);
else
else
rv = GetHomeCountry(value);
break;
case 'P':
@ -362,7 +362,7 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
break;
case 'L':
if (attrname[1] == 'a') {
if (attrname[4] == 'N')
if (attrname[4] == 'N')
rv = GetLastName(value);
else {
// XXX todo
@ -378,11 +378,11 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
case 'N':
if (attrname[1] == 'o')
rv = GetNotes(value);
else
else
rv = GetNickName(value);
break;
case 'P':
switch (attrname[2]) {
switch (attrname[2]) {
case 'e':
{
PRUint32 format;
@ -428,11 +428,11 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
else
rv = GetSpouseName(value);
break;
case 'W':
case 'W':
if (attrname[1] == 'e') {
if (attrname[7] == '1')
rv = GetWebPage1(value);
else
else
rv = GetWebPage2(value);
}
else {
@ -440,13 +440,13 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
case 'A':
if (attrname[11] == '\0')
rv = GetWorkAddress(value);
else
else
rv = GetWorkAddress2(value);
break;
case 'C':
if (attrname[5] == 'i')
rv = GetWorkCity(value);
else
else
rv = GetWorkCountry(value);
break;
case 'P':
@ -473,7 +473,7 @@ NS_IMETHODIMP nsAbCardProperty::GetCardValue(const char *attrname, nsAString &va
}
// don't assert here, as failure is expected in certain cases
// we call GetCardValue() from nsAbView::Init() to determine if the
// we call GetCardValue() from nsAbView::Init() to determine if the
// saved sortColumn is valid or not.
return rv;
}
@ -564,11 +564,11 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const nsAStri
}
break;
case 'D':
if (attrname[1] == 'i')
if (attrname[1] == 'i')
rv = SetDisplayName(value);
else if (attrname[2] == 'f')
rv = SetDefaultAddress(value);
else
else
rv = SetDepartment(value);
break;
case 'F':
@ -595,13 +595,13 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const nsAStri
case 'A':
if (attrname[11] == '\0')
rv = SetHomeAddress(value);
else
else
rv = SetHomeAddress2(value);
break;
case 'C':
if (attrname[5] == 'i')
rv = SetHomeCity(value);
else
else
rv = SetHomeCountry(value);
break;
case 'P':
@ -626,10 +626,10 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const nsAStri
break;
case 'L':
if (attrname[1] == 'a') {
if (attrname[4] == 'N')
if (attrname[4] == 'N')
rv = SetLastName(value);
else {
// XXX todo
// XXX todo
// fix me? LDAP code gets here
rv = SetLastModifiedDate(0);
}
@ -640,11 +640,11 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const nsAStri
case 'N':
if (attrname[1] == 'o')
rv = SetNotes(value);
else
else
rv = SetNickName(value);
break;
case 'P':
switch (attrname[2]) {
switch (attrname[2]) {
case 'e':
switch (value.First()) {
case 't': // "true"
@ -686,11 +686,11 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const nsAStri
else
rv = SetSpouseName(value);
break;
case 'W':
case 'W':
if (attrname[1] == 'e') {
if (attrname[7] == '1')
rv = SetWebPage1(value);
else
else
rv = SetWebPage2(value);
}
else {
@ -698,13 +698,13 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const nsAStri
case 'A':
if (attrname[11] == '\0')
rv = SetWorkAddress(value);
else
else
rv = SetWorkAddress2(value);
break;
case 'C':
if (attrname[5] == 'i')
rv = SetWorkCity(value);
else
else
rv = SetWorkCountry(value);
break;
case 'P':
@ -968,9 +968,9 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
PRBool vCardHasData = PR_FALSE;
VObject* vObj = newVObject(VCCardProp);
VObject* t;
// [comment from 4.x]
// Big flame coming....so Vobject is not designed at all to work with an array of
// Big flame coming....so Vobject is not designed at all to work with an array of
// attribute values. It wants you to have all of the attributes easily available. You
// cannot add one attribute at a time as you find them to the vobject. Why? Because
// it creates a property for a particular type like phone number and then that property
@ -978,13 +978,13 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
// yelling from here.....I have to do a linear search through my attributes array for
// EACH vcard property we want to set. *sigh* One day I will have time to come back
// to this function and remedy this O(m*n) function where n = # attribute values and
// m = # of vcard properties....
// m = # of vcard properties....
(void)GetDisplayName(str);
if (!str.IsEmpty()) {
myAddPropValue(vObj, VCFullNameProp, str.get(), &vCardHasData);
}
(void)GetLastName(str);
if (!str.IsEmpty()) {
t = isAPropertyOf(vObj, VCNameProp);
@ -992,7 +992,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
t = addProp(vObj, VCNameProp);
myAddPropValue(t, VCFamilyNameProp, str.get(), &vCardHasData);
}
(void)GetFirstName(str);
if (!str.IsEmpty()) {
t = isAPropertyOf(vObj, VCNameProp);
@ -1018,14 +1018,14 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
t = addProp(vObj, VCOrgProp);
myAddPropValue(t, VCOrgUnitProp, str.get(), &vCardHasData);
}
(void)GetWorkAddress2(str);
if (!str.IsEmpty())
{
t = isAPropertyOf(vObj, VCAdrProp);
if (!t)
t = addProp(vObj, VCAdrProp);
myAddPropValue(t, VCPostalBoxProp, str.get(), &vCardHasData);
myAddPropValue(t, VCPostalBoxProp, str.get(), &vCardHasData);
}
(void)GetWorkAddress(str);
@ -1085,10 +1085,10 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
(void)GetPrimaryEmail(str);
if (!str.IsEmpty())
{
t = myAddPropValue(vObj, VCEmailAddressProp, str.get(), &vCardHasData);
t = myAddPropValue(vObj, VCEmailAddressProp, str.get(), &vCardHasData);
addProp(t, VCInternetProp);
}
(void)GetJobTitle(str);
if (!str.IsEmpty())
{
@ -1115,7 +1115,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
t = myAddPropValue(vObj, VCTelephoneProp, str.get(), &vCardHasData);
addProp(t, VCPagerProp);
}
(void)GetHomePhone(str);
if (!str.IsEmpty())
{
@ -1135,7 +1135,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
{
myAddPropValue(vObj, VCNoteProp, str.get(), &vCardHasData);
}
PRUint32 format;
(void)GetPreferMailFormat(&format);
if (format == nsIAbPreferMailFormat::html) {
@ -1150,7 +1150,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToEscapedVCard(char **aResult)
{
myAddPropValue(vObj, VCURLProp, str.get(), &vCardHasData);
}
myAddPropValue(vObj, VCVersionProp, NS_LITERAL_STRING("2.1").get(), nsnull);
if (!vCardHasData) {
@ -1178,7 +1178,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToBase64EncodedXML(char **result)
// Get Address Book string and set it as title of XML document
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIStringBundleService> stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
nsCOMPtr<nsIStringBundleService> stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = stringBundleService->CreateBundle(sAddrbookProperties, getter_AddRefs(bundle));
if (NS_SUCCEEDED(rv)) {
@ -1208,18 +1208,18 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
nsresult rv;
nsCOMPtr<nsIPrefBranch> prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv,rv);
PRInt32 generatedNameFormat;
rv = prefBranch->GetIntPref(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST, &generatedNameFormat);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIAddrBookSession> abSession = do_GetService(NS_ADDRBOOKSESSION_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsString generatedName;
rv = abSession->GenerateNameFromCard(this, generatedNameFormat, getter_Copies(generatedName));
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr<mozITXTToHTMLConv> conv = do_CreateInstance(MOZ_TXTTOHTMLCONV_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv,rv);
@ -1229,12 +1229,12 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIStringBundleService> stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
nsCOMPtr<nsIStringBundleService> stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv,rv);
rv = stringBundleService->CreateBundle(sAddrbookProperties, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv,rv);
NS_ENSURE_SUCCESS(rv,rv);
nsString heading;
rv = bundle->GetStringFromName(NS_LITERAL_STRING("headingCardFor").get(), getter_Copies(heading));
NS_ENSURE_SUCCESS(rv, rv);
@ -1261,7 +1261,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
NS_ENSURE_SUCCESS(rv,rv);
}
xmlStr.Append(safeText);
xmlStr.AppendLiteral("</GeneratedName>\n"
"<table><tr><td>");
@ -1277,7 +1277,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
else {
rv = AppendSection(CUSTOM_ATTRS_ARRAY, sizeof(CUSTOM_ATTRS_ARRAY)/sizeof(AppendItem), NS_LITERAL_STRING("headingDescription"),
bundle, conv, xmlStr);
xmlStr.AppendLiteral("<section><sectiontitle>");
rv = bundle->GetStringFromName(NS_LITERAL_STRING("headingAddresses").get(), getter_Copies(heading));
@ -1288,14 +1288,14 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
nsCOMPtr<nsIRDFService> rdfService = do_GetService("@mozilla.org/rdf/rdf-service;1", &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr <nsIRDFResource> resource;
rv = rdfService->GetResource(m_MailListURI, getter_AddRefs(resource));
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr <nsIAbDirectory> mailList = do_QueryInterface(resource, &rv);
NS_ENSURE_SUCCESS(rv,rv);
nsCOMPtr<nsISupportsArray> addresses;
rv = mailList->GetAddressLists(getter_AddRefs(addresses));
if (addresses) {
@ -1322,7 +1322,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
xmlStr.Append(safeText);
xmlStr.AppendLiteral(" &lt;");
rv = listCard->GetPrimaryEmail(primaryEmail);
NS_ENSURE_SUCCESS(rv,rv);
@ -1343,7 +1343,7 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(nsAString &aXMLSubstr)
rv = AppendSection(HOME_ATTRS_ARRAY, sizeof(HOME_ATTRS_ARRAY)/sizeof(AppendItem), NS_LITERAL_STRING("headingHome"), bundle, conv, xmlStr);
rv = AppendSection(WORK_ATTRS_ARRAY, sizeof(WORK_ATTRS_ARRAY)/sizeof(AppendItem), NS_LITERAL_STRING("headingWork"), bundle, conv, xmlStr);
xmlStr.AppendLiteral("</td></tr></table>");
aXMLSubstr = xmlStr;
@ -1360,13 +1360,10 @@ nsresult nsAbCardProperty::AppendData(const char *aAttrName, mozITXTToHTMLConv *
if (attrValue.IsEmpty())
return NS_OK;
nsAutoString attrNameStr;
attrNameStr.AssignWithConversion(aAttrName);
aResult.Append(PRUnichar('<'));
aResult.Append(attrNameStr);
aResult.Append(NS_ConvertASCIItoUTF16(aAttrName));
aResult.Append(PRUnichar('>'));
// use ScanTXT to convert < > & to safe values.
nsString safeText;
rv = aConv->ScanTXT(attrValue.get(), mozITXTToHTMLConv::kEntities, getter_Copies(safeText));
@ -1374,7 +1371,7 @@ nsresult nsAbCardProperty::AppendData(const char *aAttrName, mozITXTToHTMLConv *
aResult.Append(safeText);
aResult.AppendLiteral("</");
aResult.Append(attrNameStr);
aResult.Append(NS_ConvertASCIItoUTF16(aAttrName));
aResult.Append(PRUnichar('>'));
return NS_OK;
@ -1446,15 +1443,12 @@ nsresult nsAbCardProperty::AppendLine(const AppendItem &aItem,
NS_ENSURE_SUCCESS(rv,rv);
if (attrValue.IsEmpty())
return NS_OK;
return NS_OK;
nsAutoString attrNameStr;
attrNameStr.AssignWithConversion(aItem.mColumn);
aResult.Append(PRUnichar('<'));
aResult.Append(attrNameStr);
aResult.Append(NS_ConvertASCIItoUTF16(aItem.mColumn));
aResult.Append(PRUnichar('>'));
// use ScanTXT to convert < > & to safe values.
nsString safeText;
rv = aConv->ScanTXT(attrValue.get(), mozITXTToHTMLConv::kEntities, getter_Copies(safeText));
@ -1462,7 +1456,7 @@ nsresult nsAbCardProperty::AppendLine(const AppendItem &aItem,
aResult.Append(safeText);
aResult.AppendLiteral("</");
aResult.Append(attrNameStr);
aResult.Append(NS_ConvertASCIItoUTF16(aItem.mColumn));
aResult.Append(PRUnichar('>'));
return NS_OK;
@ -1476,9 +1470,9 @@ nsresult nsAbCardProperty::AppendLabel(const AppendItem &aItem,
NS_ENSURE_ARG_POINTER(aBundle);
nsresult rv;
nsString label;
nsString attrValue;
rv = GetCardValue(aItem.mColumn, attrValue);
@ -1499,14 +1493,14 @@ nsresult nsAbCardProperty::AppendLabel(const AppendItem &aItem,
NS_ENSURE_SUCCESS(rv,rv);
aResult.AppendLiteral("</labelrow>");
return NS_OK;
}
nsresult nsAbCardProperty::AppendCityStateZip(const AppendItem &aItem,
nsIStringBundle *aBundle,
mozITXTToHTMLConv *aConv,
nsString &aResult)
nsString &aResult)
{
NS_ENSURE_ARG_POINTER(aBundle);
@ -1527,7 +1521,7 @@ nsresult nsAbCardProperty::AppendCityStateZip(const AppendItem &aItem,
rv = AppendLine(aItem, aConv, cityResult);
NS_ENSURE_SUCCESS(rv,rv);
item.mColumn = stateCol;
item.mLabel = "";
@ -1558,11 +1552,11 @@ nsresult nsAbCardProperty::AppendCityStateZip(const AppendItem &aItem,
NS_ENSURE_SUCCESS(rv,rv);
}
else {
if (!cityResult.IsEmpty())
if (!cityResult.IsEmpty())
formattedString = cityResult;
else if (!stateResult.IsEmpty())
else if (!stateResult.IsEmpty())
formattedString = stateResult;
else
else
formattedString = zipResult;
}

14
mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
Просмотреть файл

@ -292,20 +292,6 @@ nsresult nsAbLDAPProcessReplicationData::OnLDAPSearchEntry(nsILDAPMessage *aMess
return NS_OK;
}
#ifdef DEBUG_rdayal
nsString firstName;
rv = card.GetFirstName(getter_Copies(firstName));
NS_ENSURE_SUCCESS(rv,rv);
nsString lastName;
rv = card.GetLastName(getter_Copies(lastName));
NS_ENSURE_SUCCESS(rv,rv);
nsCAutoString name;
name.AssignWithConversion(firstName);
name.Append(" ");
name.AppendWithConversion(lastName);
printf("\n LDAPReplication :: got card #: %d, name: %s \n", mCount, name.get());
#endif
rv = mReplicationDB->CreateNewCardAndAddToDB(newCard, PR_FALSE);
if(NS_FAILED(rv)) {
Abort();

2
mailnews/addrbook/src/nsAbOutlookDirectory.cpp
Просмотреть файл

@ -670,7 +670,7 @@ static nsresult BuildRestriction(nsIAbBooleanConditionString *aCondition,
NS_ENSURE_SUCCESS(retCode, retCode) ;
retCode = aCondition->GetValue(getter_Copies(value)) ;
NS_ENSURE_SUCCESS(retCode, retCode) ;
valueAscii.AssignWithConversion(value.get()) ;
LossyCopyUTF16toASCII(value, valueAscii);
propertyTag = findPropertyTag(name.get()) ;
if (propertyTag == 0) {
aSkipItem = PR_TRUE ;

28
mailnews/addrbook/src/nsAbWinHelper.cpp
Просмотреть файл

@ -379,12 +379,10 @@ BOOL nsAbWinHelper::GetPropertyString(const nsMapiEntry& aObject,
if (!GetMAPIProperties(aObject, &aPropertyTag, 1, values, valueCount)) { return FALSE ; }
if (valueCount == 1 && values != NULL) {
if (PROP_TYPE(values->ulPropTag) == PT_STRING8) {
if (PROP_TYPE(values->ulPropTag) == PT_STRING8)
aName = values->Value.lpszA ;
}
else if (PROP_TYPE(values->ulPropTag) == PT_UNICODE) {
aName.AssignWithConversion(values->Value.lpszW) ;
}
else if (PROP_TYPE(values->ulPropTag) == PT_UNICODE)
LossyCopyUTF16toASCII(values->Value.lpszW, aName);
}
FreeBuffer(values) ;
return TRUE ;
@ -399,12 +397,10 @@ BOOL nsAbWinHelper::GetPropertyUString(const nsMapiEntry& aObject, ULONG aProper
if (!GetMAPIProperties(aObject, &aPropertyTag, 1, values, valueCount)) { return FALSE ; }
if (valueCount == 1 && values != NULL) {
if (PROP_TYPE(values->ulPropTag) == PT_UNICODE) {
if (PROP_TYPE(values->ulPropTag) == PT_UNICODE)
aName = values->Value.lpszW ;
}
else if (PROP_TYPE(values->ulPropTag) == PT_STRING8) {
aName.AssignWithConversion(values->Value.lpszA) ;
}
else if (PROP_TYPE(values->ulPropTag) == PT_STRING8)
CopyASCIItoUTF16(values->Value.lpszA, aName);
}
FreeBuffer(values) ;
return TRUE ;
@ -425,12 +421,8 @@ BOOL nsAbWinHelper::GetPropertiesUString(const nsMapiEntry& aObject, const ULONG
for (i = 0 ; i < valueCount ; ++ i) {
if (PROP_ID(values [i].ulPropTag) == PROP_ID(aPropertyTags [i])) {
if (PROP_TYPE(values [i].ulPropTag) == PT_STRING8) {
nsAutoString temp ;
temp.AssignWithConversion (values [i].Value.lpszA) ;
aNames.AppendString(temp) ;
}
if (PROP_TYPE(values [i].ulPropTag) == PT_STRING8)
aNames.AppendString(NS_ConvertASCIItoUTF16(values [i].Value.lpszA));
else if (PROP_TYPE(values [i].ulPropTag) == PT_UNICODE) {
aNames.AppendString(nsAutoString (values [i].Value.lpszW)) ;
}
@ -560,7 +552,7 @@ BOOL nsAbWinHelper::SetPropertyUString(const nsMapiEntry& aObject, ULONG aProper
value.Value.lpszW = NS_CONST_CAST(WCHAR *, aValue) ;
}
else if (PROP_TYPE(aPropertyTag) == PT_STRING8) {
alternativeValue.AssignWithConversion(aValue) ;
LossyCopyUTF16toASCII(aValue, alternativeValue);
value.Value.lpszA = NS_CONST_CAST(char *, alternativeValue.get()) ;
}
else {
@ -588,7 +580,7 @@ BOOL nsAbWinHelper::SetPropertiesUString(const nsMapiEntry& aObject, const ULONG
values [currentValue ++].Value.lpszW = NS_CONST_CAST(WCHAR *, aValues [i].get()) ;
}
else if (PROP_TYPE(aPropertiesTag [i]) == PT_STRING8) {
alternativeValue.AssignWithConversion(aValues [i].get()) ;
LossyCopyUTF16toASCII(aValues [i].get(), alternativeValue);
char *av = strdup(alternativeValue.get()) ;
if (!av) {
retCode = FALSE ;

3
mailnews/addrbook/src/nsDirectoryDataSource.cpp
Просмотреть файл

@ -539,7 +539,8 @@ nsresult nsAbDirectoryDataSource::createDirectoryUriNode(nsIAbDirectory *directo
nsCString uri;
nsresult rv = source->GetValue(getter_Copies(uri));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString nameString; nameString.AssignWithConversion(uri);
nsAutoString nameString;
CopyASCIItoUTF16(uri, nameString);
rv = createNode(nameString.get(), target);
NS_ENSURE_SUCCESS(rv,rv);
return rv;

8
mailnews/base/src/nsMessenger.cpp
Просмотреть файл

@ -2482,10 +2482,10 @@ struct msgAttachment
void Clear()
{
CRTFREEIF(mContentType);
CRTFREEIF(mUrl);
CRTFREEIF(mDisplayName);
CRTFREEIF(mMessageUri);
NS_Free(mContentType);
NS_Free(mUrl);
NS_Free(mDisplayName);
NS_Free(mMessageUri);
}
PRBool Init(const char * aContentType, const char * aUrl,

4
mailnews/base/src/nsMsgAccountManagerDS.cpp
Просмотреть файл

@ -419,7 +419,7 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
nsAutoString panelTitleName;
panelTitleName.AssignLiteral("prefPanel-");
panelTitleName.AppendWithConversion(sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX));
panelTitleName.Append(NS_ConvertASCIItoUTF16(sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX)));
bundle->GetStringFromName(panelTitleName.get(), getter_Copies(pageTitle));
}
}
@ -464,7 +464,7 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
// turn NC#PageTitlefoobar into foobar, so we can get the am-foobar.xul file
str.AssignLiteral("am-");
str.AppendWithConversion((sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX)));
str.Append(NS_ConvertASCIItoUTF16(sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX)));
str.AppendLiteral(".xul");
}
}

57
mailnews/base/src/nsSubscribableServer.cpp
Просмотреть файл

@ -148,7 +148,7 @@ nsSubscribableServer::AddTo(const nsACString& aName, PRBool aAddAsSubscribed,
PRBool aSubscribable, PRBool aChangeIfExists)
{
nsresult rv = NS_OK;
if (mStopped) {
#ifdef DEBUG_seth
printf("stopped!\n");
@ -158,7 +158,7 @@ nsSubscribableServer::AddTo(const nsACString& aName, PRBool aAddAsSubscribed,
SubscribeTreeNode *node = nsnull;
// todo, shouldn't we pass in aAddAsSubscribed, for the
// todo, shouldn't we pass in aAddAsSubscribed, for the
// default value if we create it?
rv = FindAndCreateNode(aName, &node);
NS_ENSURE_SUCCESS(rv,rv);
@ -244,7 +244,7 @@ nsSubscribableServer::NotifyAssert(SubscribeTreeNode *subjectNode, nsIRDFResourc
if (!hasObservers) {
return NS_OK;
}
nsCAutoString subjectUri;
BuildURIFromNode(subjectNode, subjectUri);
@ -434,8 +434,8 @@ nsSubscribableServer::SetShowFullName(PRBool showFullName)
mShowFullName = showFullName;
return NS_OK;
}
nsresult
nsresult
nsSubscribableServer::FreeSubtree(SubscribeTreeNode *node)
{
nsresult rv = NS_OK;
@ -443,7 +443,7 @@ nsSubscribableServer::FreeSubtree(SubscribeTreeNode *node)
if (node) {
// recursively free the children
if (node->firstChild) {
// will free node->firstChild
// will free node->firstChild
rv = FreeSubtree(node->firstChild);
NS_ENSURE_SUCCESS(rv,rv);
node->firstChild = nsnull;
@ -460,21 +460,21 @@ nsSubscribableServer::FreeSubtree(SubscribeTreeNode *node)
#ifdef HAVE_SUBSCRIBE_DESCRIPTION
NS_ASSERTION(node->description == nsnull, "you need to free the description");
#endif
CRTFREEIF(node->name);
#if 0
NS_Free(node->name);
#if 0
node->name = nsnull;
node->parent = nsnull;
node->lastChild = nsnull;
node->cachedChild = nsnull;
#endif
PR_Free(node);
PR_Free(node);
}
return NS_OK;
}
nsresult
nsresult
nsSubscribableServer::CreateNode(SubscribeTreeNode *parent, const char *name, SubscribeTreeNode **result)
{
NS_ASSERTION(result && name, "result or name is null");
@ -524,7 +524,7 @@ nsSubscribableServer::AddChildNode(SubscribeTreeNode *parent, const char *name,
parent->lastChild = *child;
rv = NotifyAssert(parent, kNC_Child, *child);
NS_ENSURE_SUCCESS(rv,rv);
NS_ENSURE_SUCCESS(rv,rv);
return NS_OK;
}
@ -630,15 +630,15 @@ nsSubscribableServer::FindAndCreateNode(const nsACString &aPath,
return NS_OK;
}
char *pathStr = ToNewCString(aPath);
char *token = nsnull;
char *rest = pathStr;
nsCString pathStr(aPath);
char *rest = pathStr.BeginWriting();
// todo do this only once
char delimstr[2];
delimstr[0] = mDelimiter;
delimstr[1] = '\0';
*aResult = nsnull;
SubscribeTreeNode *parent = mTreeRoot;
@ -646,15 +646,12 @@ nsSubscribableServer::FindAndCreateNode(const nsACString &aPath,
token = NS_strtok(delimstr, &rest);
while (token && *token) {
rv = AddChildNode(parent, token, &child);
if (NS_FAILED(rv)) {
CRTFREEIF(pathStr);
return rv;
}
token = NS_strtok(delimstr, &rest);
parent = child;
}
NS_Free(pathStr);
rv = AddChildNode(parent, token, &child);
if (NS_FAILED(rv))
return rv;
token = NS_strtok(delimstr, &rest);
parent = child;
}
// the last child we add is the result
*aResult = child;
@ -676,7 +673,7 @@ nsSubscribableServer::HasChildren(const nsACString &aPath, PRBool *aHasChildren)
NS_ASSERTION(node,"didn't find the node");
if (!node) return NS_ERROR_FAILURE;
*aHasChildren = (node->firstChild != nsnull);
return NS_OK;
}
@ -748,7 +745,7 @@ nsSubscribableServer::GetFirstChildURI(const nsACString &aPath,
nsACString &aResult)
{
aResult.Truncate();
SubscribeTreeNode *node = nsnull;
nsresult rv = FindAndCreateNode(aPath, &node);
NS_ENSURE_SUCCESS(rv,rv);
@ -758,8 +755,8 @@ nsSubscribableServer::GetFirstChildURI(const nsACString &aPath,
// no children
if (!node->firstChild) return NS_ERROR_FAILURE;
BuildURIFromNode(node->firstChild, aResult);
BuildURIFromNode(node->firstChild, aResult);
return NS_OK;
}
@ -793,7 +790,7 @@ nsSubscribableServer::GetChildren(const nsACString &aPath,
// in the subscribe dialog
SubscribeTreeNode *current = node->lastChild;
// return failure if there are no children.
if (!current) return NS_ERROR_FAILURE;
if (!current) return NS_ERROR_FAILURE;
while (current) {
nsCAutoString uri;
@ -809,7 +806,7 @@ nsSubscribableServer::GetChildren(const nsACString &aPath,
// todo, is this creating nsMsgFolders?
mRDFService->GetResource(uri, getter_AddRefs(res));
array->AppendElement(res);
current = current->prevSibling;
}

16
mailnews/base/util/nsMsgDBFolder.cpp
Просмотреть файл

@ -200,14 +200,14 @@ nsMsgDBFolder::~nsMsgDBFolder(void)
{
if (--mInstanceCount == 0) {
NS_IF_RELEASE(gCollationKeyGenerator);
CRTFREEIF(kLocalizedInboxName);
CRTFREEIF(kLocalizedTrashName);
CRTFREEIF(kLocalizedSentName);
CRTFREEIF(kLocalizedDraftsName);
CRTFREEIF(kLocalizedTemplatesName);
CRTFREEIF(kLocalizedUnsentName);
CRTFREEIF(kLocalizedJunkName);
CRTFREEIF(kLocalizedBrandShortName);
NS_Free(kLocalizedInboxName);
NS_Free(kLocalizedTrashName);
NS_Free(kLocalizedSentName);
NS_Free(kLocalizedDraftsName);
NS_Free(kLocalizedTemplatesName);
NS_Free(kLocalizedUnsentName);
NS_Free(kLocalizedJunkName);
NS_Free(kLocalizedBrandShortName);
#ifdef MSG_FASTER_URI_PARSING
mParsingURL = nsnull;
#endif

1
mailnews/base/util/nsMsgI18N.cpp
Просмотреть файл

@ -551,7 +551,6 @@ nsresult nsMsgI18NFormatNNTPXPATInNonRFC1522Format(const nsCString& aCharset,
nsCString& outString)
{
LossyCopyUTF16toASCII(inString, outString);
outString.AssignWithConversion(inString);
return NS_OK;
}

4
mailnews/base/util/nsMsgIdentity.cpp
Просмотреть файл

@ -289,8 +289,8 @@ nsMsgIdentity::getFolderPref(const char *prefname, nsCString& retval, PRUint32 f
if (server)
{
nsCOMPtr <nsIMsgFolder> msgFolder;
server->GetMsgFolderFromURI(folderResource, retval, getter_AddRefs(msgFolder));
return msgFolder->GetURI(retval);
rv = server->GetMsgFolderFromURI(folderResource, retval, getter_AddRefs(msgFolder));
return NS_SUCCEEDED(rv) ? msgFolder->GetURI(retval) : rv;
}
}
}

4
mailnews/base/util/nsMsgIncomingServer.cpp
Просмотреть файл

@ -1653,10 +1653,10 @@ nsMsgIncomingServer::ConfigureTemporaryServerSpamFilters(nsIMsgFilterList *filte
return NS_OK;
// check if filters have been setup already.
nsAutoString yesFilterName, noFilterName;
yesFilterName.AppendWithConversion(serverFilterName);
CopyASCIItoUTF16(serverFilterName, yesFilterName);
yesFilterName.AppendLiteral("Yes");
noFilterName.AppendWithConversion(serverFilterName);
CopyASCIItoUTF16(serverFilterName, noFilterName);
noFilterName.AppendLiteral("No");
nsCOMPtr<nsIMsgFilter> newFilter;

1754
mailnews/base/util/nsMsgKeySet.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

47
mailnews/compose/src/nsMsgCompose.cpp
Просмотреть файл

@ -1083,7 +1083,7 @@ NS_IMETHODIMP nsMsgCompose::SendMsg(MSG_DeliverMode deliverMode, nsIMsgIdentity
if (NS_SUCCEEDED(rv) && !msgBody.IsEmpty())
{
// Convert body to mail charset
nsCString outCString;
nsCString outCString;
nsCString fallbackCharset;
PRBool isAsciiOnly;
// check if the body text is covered by the current charset.
@ -1585,8 +1585,6 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
if (m_identity)
{
nsCString::const_iterator start, end;
/* Setup reply-to field */
nsCString replyTo;
m_identity->GetReplyTo(replyTo);
@ -1594,16 +1592,12 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
{
nsCString replyToStr;
replyToStr.Assign(m_compFields->GetReplyTo());
replyToStr.BeginReading(start);
replyToStr.EndReading(end);
if (FindInReadable(replyTo, start, end) == PR_FALSE) {
if (replyToStr.Find(replyTo) == -1) {
if (replyToStr.Length() > 0)
replyToStr.Append(',');
replyToStr.Append(replyTo);
m_compFields->SetReplyTo(replyToStr.get());
}
m_compFields->SetReplyTo(replyToStr.get());
}
/* Setup bcc field */
@ -1613,19 +1607,14 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
{
nsCString bccStr;
bccStr.Assign(m_compFields->GetBcc());
bccStr.BeginReading(start);
bccStr.EndReading(end);
nsCString bccList;
m_identity->GetDoBccList(bccList);
if (FindInReadable(bccList, start, end) == PR_FALSE) {
if (bccStr.Length() > 0)
bccStr.Append(',');
bccStr.Append(bccList);
}
m_compFields->SetBcc(bccStr.get());
nsCString bccList;
m_identity->GetDoBccList(bccList);
if (bccStr.Find(bccList) == -1) {
if (bccStr.Length() > 0)
bccStr.Append(',');
bccStr.Append(bccList);
m_compFields->SetBcc(bccStr.get());
}
}
}
@ -2352,19 +2341,11 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnStopRequest(nsIRequest *request, ns
if (type == nsIMsgCompType::ReplyToList && ! listPost.IsEmpty())
{
nsString::const_iterator mailtoStart, mailtoEnd;
listPost.BeginReading(mailtoStart);
listPost.EndReading(mailtoEnd);
nsAutoString mailtoText(NS_LITERAL_STRING("<mailto:"));
PRBool mailtoFound = FindInReadable(mailtoText, mailtoStart, mailtoEnd);
// Strip off the leading "<mailto:" and trailing ">"
if (mailtoFound && listPost.Equals(mailtoStart.get()) &&
listPost.RFindChar('>') == listPost.Length() - 1)
if (StringBeginsWith(listPost, NS_LITERAL_STRING("<mailto:")) && listPost.CharAt(listPost.Length() - 1) == '>')
{
listPost.Cut(0, mailtoText.Length());
listPost.Cut(0, strlen("<mailto:"));
listPost.Cut(listPost.Length() - 1, 1);
compFields->SetTo(listPost);
}
}
@ -3804,7 +3785,7 @@ nsMsgCompose::ProcessSignature(nsIMsgIdentity *identity, PRBool aQuoted, nsStrin
/* XXX pp This gives me 4 slashes on Unix, that's at least one to
much. Better construct the URL with some service. */
// this isn't right on windows - need to convert to url format...
sigOutput.AppendWithConversion(sigNativePath);
sigOutput.Append(NS_ConvertASCIItoUTF16(sigNativePath));
sigOutput.AppendLiteral("\" border=0>");
sigOutput.AppendLiteral(htmlsigclose);
}

2
mailnews/compose/src/nsMsgSend.cpp
Просмотреть файл

@ -2072,7 +2072,7 @@ nsMsgComposeAndSend::ProcessMultipartRelated(PRInt32 *aMailboxCount, PRInt32 *aN
if (m_attachments[duplicateOf == -1 ? i : duplicateOf].m_content_id)
{
nsString newSpec(NS_LITERAL_STRING("cid:"));
newSpec.AppendWithConversion(m_attachments[duplicateOf == -1 ? i : duplicateOf].m_content_id);
newSpec.Append(NS_ConvertASCIItoUTF16(m_attachments[duplicateOf == -1 ? i : duplicateOf].m_content_id));
// Now, we know the types of objects this node can be, so we will do
// our query interface here and see what we come up with

5
mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp
Просмотреть файл

@ -600,9 +600,8 @@ void Tokenizer::tokenize(const char* aText)
stripHTML(text, strippedUCS2);
// convert 0x3000(full width space) into 0x0020
nsString::iterator substr_start, substr_end;
strippedUCS2.BeginWriting(substr_start);
strippedUCS2.EndWriting(substr_end);
PRUnichar * substr_start = strippedUCS2.BeginWriting();
PRUnichar * substr_end = strippedUCS2.EndWriting();
while (substr_start != substr_end) {
if (*substr_start == 0x3000)
*substr_start = 0x0020;

4
mailnews/imap/src/nsIMAPHostSessionList.cpp
Просмотреть файл

@ -209,7 +209,7 @@ NS_IMETHODIMP nsIMAPHostSessionList::GetPasswordForHost(const char *serverKey, n
PR_EnterMonitor(gCachedHostInfoMonitor);
nsIMAPHostInfo *host = FindHost(serverKey);
if (host)
result.AssignWithConversion(host->fCachedPassword);
CopyASCIItoUTF16(host->fCachedPassword, result);
PR_ExitMonitor(gCachedHostInfoMonitor);
return (host == NULL) ? NS_ERROR_ILLEGAL_VALUE : NS_OK;
}
@ -657,7 +657,7 @@ NS_IMETHODIMP nsIMAPHostSessionList::GetOnlineInboxPathForHost(const char *serve
ns = host->fNamespaceList->GetDefaultNamespaceOfType(kPersonalNamespace);
if (ns)
{
result.AssignWithConversion(ns->GetPrefix());
CopyASCIItoUTF16(ns->GetPrefix(), result);
result.AppendLiteral("INBOX");
}
}

17
mailnews/imap/src/nsImapMailFolder.cpp
Просмотреть файл

@ -1901,7 +1901,6 @@ nsImapMailFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatab
else
{
nsAutoString autoOnlineName;
// autoOnlineName.AssignWithConversion(name);
(*folderInfo)->GetMailboxName(autoOnlineName);
if (autoOnlineName.IsEmpty())
{
@ -3230,11 +3229,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
{
nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
if (compService)
{
nsAutoString forwardStr;
forwardStr.AssignWithConversion(forwardTo.get());
rv = compService->ForwardMessage(forwardStr, msgHdr, msgWindow, server);
}
rv = compService->ForwardMessage(NS_ConvertASCIItoUTF16(forwardTo), msgHdr, msgWindow, server);
}
}
break;
@ -4028,17 +4023,11 @@ nsresult nsImapMailFolder::HandleCustomFlags(nsMsgKey uidOfMessage, nsIMsgDBHdr
{
ToLowerCase(keywords);
PRBool messageClassified = PR_TRUE;
nsCString::const_iterator b, e;
if (FindInReadable(NS_LITERAL_CSTRING("NonJunk"), keywords.BeginReading(b),
keywords.EndReading(e), nsCaseInsensitiveCStringComparator()))
mDatabase->SetStringProperty(uidOfMessage, "junkscore", "0");
// Mac Mail uses "NotJunk"
else if (FindInReadable(NS_LITERAL_CSTRING("NotJunk"), keywords.BeginReading(b),
keywords.EndReading(e), nsCaseInsensitiveCStringComparator()))
if (keywords.Find("NonJunk", PR_TRUE /* ignore case */) != -1 || keywords.Find("NotJunk", PR_TRUE /* ignore case */) != -1)
mDatabase->SetStringProperty(uidOfMessage, "junkscore", "0");
// ### TODO: we really should parse the keywords into space delimited keywords before checking
else if (FindInReadable(NS_LITERAL_CSTRING("Junk"), keywords.BeginReading(b),
keywords.EndReading(e), nsCaseInsensitiveCStringComparator()))
else if (keywords.Find("Junk", PR_TRUE /* ignore case */) != -1)
{
PRUint32 newFlags;
dbHdr->AndFlags(~MSG_FLAG_NEW, &newFlags);

2
mailnews/imap/src/nsImapProtocol.cpp
Просмотреть файл

@ -4436,7 +4436,7 @@ nsImapProtocol::DiscoverMailboxSpec(nsImapMailboxSpec * adoptedBoxSpec)
if (GetDeleteIsMoveToTrash() && // don't set the Trash flag
// if not using the Trash model
!onlineTrashFolderExists &&
adoptedBoxSpec->mAllocatedPathName.Find(GetTrashFolderName()))
adoptedBoxSpec->mAllocatedPathName.Find(GetTrashFolderName()) != -1)
{
PRBool trashExists = PR_FALSE;
nsCString trashMatch;

6
mailnews/imap/src/nsImapUrl.cpp
Просмотреть файл

@ -794,15 +794,15 @@ void nsImapUrl::ParseImapPart(char *imapPartOfUrl)
NS_IMETHODIMP nsImapUrl::AddOnlineDirectoryIfNecessary(const char *onlineMailboxName, char ** directory)
{
nsresult rv;
nsString aString;
nsString onlineDirString;
char *newOnlineName = nsnull;
nsCOMPtr<nsIImapHostSessionList> hostSessionList =
do_GetService(kCImapHostSessionListCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = hostSessionList->GetOnlineDirForHost(m_serverKey.get(), aString);
rv = hostSessionList->GetOnlineDirForHost(m_serverKey.get(), onlineDirString);
nsCAutoString onlineDir;
onlineDir.AssignWithConversion(aString);
LossyCopyUTF16toASCII(onlineDirString, onlineDir);
// If this host has an online server directory configured
if (onlineMailboxName && !onlineDir.IsEmpty())

3
mailnews/imap/src/nsImapUtils.cpp
Просмотреть файл

@ -151,7 +151,8 @@ nsresult
nsImapURI2FullName(const char* rootURI, const char* hostName, const char* uriStr,
char **name)
{
nsAutoString uri; uri.AssignWithConversion(uriStr);
nsAutoString uri;
CopyASCIItoUTF16(uriStr, uri);
nsAutoString fullName;
if (uri.Find(rootURI) != 0)
return NS_ERROR_FAILURE;