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

Bug 1399756 - remove trailing spaces in mailnews/ (.xul, .xml, .css, .mm, .cpp). rs=white-space-only 

[skip-blame]
This commit is contained in:
Jorg K 2018-03-17 16:37:49 +01:00
Родитель 8a1ad1f303
Коммит 2643d122ad
26 изменённых файлов: 216 добавлений и 216 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
mailnews/addrbook/content/abAddressBookNameDialog.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

2
mailnews/addrbook/content/abEditCardDialog.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

2
mailnews/addrbook/content/abNewCardDialog.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

32
mailnews/addrbook/content/print.css
Просмотреть файл

@ -7,14 +7,14 @@ directory {
}
section {
display:block;
display:block;
margin: 15px 20px;
}
sectiontitle {
display:block;
font-weight:bold;
font-family:verdana;
display:block;
font-weight:bold;
font-family:verdana;
font-size:small;
}
@ -23,37 +23,37 @@ labelrow {
}
label {
display:inline;
font-family:verdana;
display:inline;
font-family:verdana;
font-size:small;
}
GeneratedName {
display:block;
font-weight:bold;
font-family:verdana;
display:block;
font-weight:bold;
font-family:verdana;
margin-top: 20px;
margin-bottom: 3px;
margin-inline-end: 10px;
margin-inline-start: 10px;
}
FirstName, LastName,
FirstName, LastName,
HomeAddress, HomeAddress2, HomeCountry,
WorkAddress, WorkAddress2, WorkCountry,
JobTitle, Department, Company, Notes {
display: block;
font-family: verdana;
display: block;
font-family: verdana;
font-size: small;
}
DisplayName, NickName,
WorkPhone, HomePhone, FaxNumber, PagerNumber, CellularNumber,
HomeCity, HomeState, HomeZipCode,
WorkCity, WorkState, WorkZipCode,
WorkCity, WorkState, WorkZipCode,
Custom1, Custom2, Custom3, Custom4 {
display: inline;
font-family: verdana;
display: inline;
font-family: verdana;
font-size: small;
}
@ -84,7 +84,7 @@ tr {
}
td {
display: table-cell;
display: table-cell;
vertical-align: top;
}

18
mailnews/addrbook/prefs/content/pref-directory-add.xul
Просмотреть файл

@ -29,7 +29,7 @@
<tab label="&Offline.tab;"/>
<tab label="&Advanced.tab;"/>
</tabs>
<tabpanels id="directoryTabPanels" flex="1">
<vbox>
<grid flex="1">
@ -41,7 +41,7 @@
<rows>
<row align="center">
<label value="&directoryName.label;" accesskey="&directoryName.accesskey;"
<label value="&directoryName.label;" accesskey="&directoryName.accesskey;"
control="description"/>
<textbox id="description" flex="1"/>
<spacer flex="1"/>
@ -53,13 +53,13 @@
<spacer flex="1"/>
</row>
<row align="center">
<label value="&directoryBaseDN.label;"
<label value="&directoryBaseDN.label;"
accesskey="&directoryBaseDN.accesskey;"
control="basedn"/>
<vbox>
<textbox id="basedn" disableiflocked="true" class="uri-element"/>
</vbox>
<button label="&findButton.label;"
<button label="&findButton.label;"
accesskey="&findButton.accesskey;" disabled="true"/>
</row>
<row align="center">
@ -94,7 +94,7 @@
</hbox>
<description id="downloadWarningMsg" hidden="true" class="error"/>
<description id="replicationProgressText" hidden="true"/>
<progressmeter id="replicationProgressMeter" mode="normal" value="0" hidden="true"/>
</vbox>
<grid>
@ -133,10 +133,10 @@
<label value="&saslMechanism.label;" control="saslMechanism" accesskey="&saslMechanism.accesskey;"/>
<menulist id="saslMechanism">
<menupopup>
<menuitem id="Simple" value=""
<menuitem id="Simple" value=""
label="&saslOff.label;"
accesskey="&saslOff.accesskey;"/>
<menuitem id="GSSAPI" value="GSSAPI"
<menuitem id="GSSAPI" value="GSSAPI"
label="&saslGSSAPI.label;"
accesskey="&saslGSSAPI.accesskey;"/>
</menupopup>
@ -147,6 +147,6 @@
</tabpanels>
</tabbox>
</vbox>
</dialog>

2
mailnews/addrbook/prefs/content/pref-editdirectories.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

50
mailnews/addrbook/src/nsAbOSXCard.mm
Просмотреть файл

@ -72,7 +72,7 @@ MapStringProperty(nsAbOSXCard *aCard, ABRecord *aOSXCard, NSString *aProperty,
NS_ASSERTION(aProperty, "This is bad! You asked for an unresolved symbol.");
NS_ASSERTION(GetPropertType(aOSXCard, aProperty) == kABStringProperty,
"Wrong type!");
SetStringProperty(aCard, [aOSXCard valueForProperty:aProperty], aMemberName,
aNotify, aAbManager);
}
@ -83,7 +83,7 @@ GetMultiValue(ABRecord *aCard, NSString *aProperty)
NS_ASSERTION(aProperty, "This is bad! You asked for an unresolved symbol.");
NS_ASSERTION(GetPropertType(aCard, aProperty) & kABMultiValueMask,
"Wrong type!");
return [aCard valueForProperty:aProperty];
}
@ -94,7 +94,7 @@ MapDate(nsAbOSXCard *aCard, NSDate *aDate, const char *aYearPropName,
{
// XXX Should we pass a format and timezone?
NSCalendarDate *date = [aDate dateWithCalendarFormat:nil timeZone:nil];
nsAutoString value;
value.AppendInt(static_cast<int32_t>([date yearOfCommonEra]));
SetStringProperty(aCard, value, aYearPropName, aNotify, aAbManager);
@ -120,10 +120,10 @@ MapMultiValue(nsAbOSXCard *aCard, ABRecord *aOSXCard,
NSString *stringValue = (aMap.mOSXKey)
? [[value valueAtIndex:j] objectForKey:aMap.mOSXKey]
: [value valueAtIndex:j];
SetStringProperty(aCard, stringValue, aMap.mPropertyName, aNotify,
aAbManager);
return true;
}
}
@ -131,7 +131,7 @@ MapMultiValue(nsAbOSXCard *aCard, ABRecord *aOSXCard,
// String wasn't found, set value of card to empty if it was set previously
SetStringProperty(aCard, EmptyString(), aMap.mPropertyName, aNotify,
aAbManager);
return false;
}
@ -222,19 +222,19 @@ nsAbOSXCard::Update(bool aNotify)
return NS_OK;
}
bool foundHome = false, foundWork = false;
uint32_t i;
for (i = 0; i < nsAbOSXUtils::kPropertyMapSize; ++i) {
const nsAbOSXPropertyMap &propertyMap = nsAbOSXUtils::kPropertyMap[i];
if (!propertyMap.mOSXProperty)
continue;
if (propertyMap.mOSXLabel) {
if (MapMultiValue(this, card, propertyMap, aNotify,
abManager) && propertyMap.mOSXProperty == kABAddressProperty) {
if (propertyMap.mOSXLabel == kABAddressHomeLabel)
if (propertyMap.mOSXLabel == kABAddressHomeLabel)
foundHome = true;
else
foundWork = true;
@ -245,14 +245,14 @@ nsAbOSXCard::Update(bool aNotify)
propertyMap.mPropertyName, aNotify, abManager);
}
}
int flags = 0;
if (kABPersonFlags)
flags = [[card valueForProperty:kABPersonFlags] intValue];
#define SET_STRING(_value, _name, _notify, _session) \
SetStringProperty(this, _value, #_name, _notify, _session)
// If kABShowAsCompany is set we use the company name as display name.
if (kABPersonFlags && (flags & kABShowAsCompany)) {
nsString company;
@ -267,7 +267,7 @@ nsAbOSXCard::Update(bool aNotify)
if (kABPersonFlags && (order == kABDefaultNameOrdering)) {
order = [addressBook defaultNameOrdering];
}
nsAutoString displayName, tempName;
if (kABPersonFlags && (order == kABFirstNameFirst)) {
GetFirstName(tempName);
@ -295,17 +295,17 @@ nsAbOSXCard::Update(bool aNotify)
}
SET_STRING(displayName, DisplayName, aNotify, abManager);
}
ABMultiValue *value = GetMultiValue(card, kABEmailProperty);
if (value) {
unsigned int count = [value count];
if (count > 0) {
unsigned int j = [value indexForIdentifier:[value primaryIdentifier]];
if (j < count)
SET_STRING([value valueAtIndex:j], PrimaryEmail, aNotify,
abManager);
// If j is 0 (first in the list) we want the second in the list
// (index 1), if j is anything else we want the first in the list
// (index 0).
@ -315,7 +315,7 @@ nsAbOSXCard::Update(bool aNotify)
abManager);
}
}
// We map the first home address we can find and the first work address
// we can find. If we find none, we map the primary address to the home
// address.
@ -324,7 +324,7 @@ nsAbOSXCard::Update(bool aNotify)
if (value) {
unsigned int count = [value count];
unsigned int j = [value indexForIdentifier:[value primaryIdentifier]];
if (j < count) {
NSDictionary *address = [value valueAtIndex:j];
if (address) {
@ -361,15 +361,15 @@ nsAbOSXCard::Update(bool aNotify)
}
}
}
#define MAP_DATE(_date, _name, _notify, _session) \
MapDate(this, _date, #_name"Year", #_name"Month", #_name"Day", _notify, \
_session)
NSDate *date = [card valueForProperty:kABBirthdayProperty];
if (date)
MAP_DATE(date, Birth, aNotify, abManager);
if (kABOtherDatesProperty) {
value = GetMultiValue(card, kABOtherDatesProperty);
if (value) {
@ -379,7 +379,7 @@ nsAbOSXCard::Update(bool aNotify)
date = [value valueAtIndex:j];
if (date) {
MAP_DATE(date, Anniversary, aNotify, abManager);
break;
}
}
@ -388,9 +388,9 @@ nsAbOSXCard::Update(bool aNotify)
}
#undef MAP_DATE
#undef SET_STRING
date = [card valueForProperty:kABModificationDateProperty];
if (date)
if (date)
SetPropertyAsUint32("LastModifiedDate",
uint32_t([date timeIntervalSince1970]));
// XXX No way to notify about this?

146
mailnews/addrbook/src/nsAbOSXDirectory.mm
Просмотреть файл

@ -114,7 +114,7 @@ Sync(NSString *aUid)
GetOrCreateGroup(aUid, getter_AddRefs(directory));
nsCOMPtr<nsIAbOSXDirectory> osxDirectory =
do_QueryInterface(directory);
if (osxDirectory) {
osxDirectory->Update();
}
@ -154,7 +154,7 @@ Sync(NSString *aUid)
-(void)ABChanged:(NSNotification *)aNotification
{
NSDictionary *changes = [aNotification userInfo];
nsresult rv;
NSArray *inserted = [changes objectForKey:kABInsertedRecords];
@ -195,7 +195,7 @@ Sync(NSString *aUid)
}
}
}
NSArray *updated = [changes objectForKey:kABUpdatedRecords];
if (updated) {
unsigned int i, count = [updated count];
@ -204,7 +204,7 @@ Sync(NSString *aUid)
Sync(uid);
}
}
NSArray *deleted = [changes objectForKey:kABDeletedRecords];
if (deleted) {
@ -231,7 +231,7 @@ Sync(NSString *aUid)
NS_ENSURE_SUCCESS_VOID(rv);
}
}
if (!inserted && !updated && !deleted) {
// XXX This is supposed to mean "everything was updated", but we get
// this whenever something has changed, so not sure what to do.
@ -244,11 +244,11 @@ MapConditionString(nsIAbBooleanConditionString *aCondition, bool aNegate,
bool &aCanHandle, ABSearchElement **aResult)
{
aCanHandle = false;
nsAbBooleanConditionType conditionType = 0;
nsresult rv = aCondition->GetCondition(&conditionType);
NS_ENSURE_SUCCESS(rv, rv);
ABSearchComparison comparison;
switch (conditionType) {
case nsIAbBooleanConditionTypes::Contains:
@ -305,20 +305,20 @@ MapConditionString(nsIAbBooleanConditionString *aCondition, bool aNegate,
break;
}
}
if (!aCanHandle)
return NS_OK;
nsCString name;
rv = aCondition->GetName(getter_Copies(name));
NS_ENSURE_SUCCESS(rv, rv);
nsString value;
rv = aCondition->GetValue(getter_Copies(value));
NS_ENSURE_SUCCESS(rv, rv);
uint32_t length = value.Length();
uint32_t i;
for (i = 0; i < nsAbOSXUtils::kPropertyMapSize; ++i) {
if (name.Equals(nsAbOSXUtils::kPropertyMap[i].mPropertyName)) {
@ -328,11 +328,11 @@ MapConditionString(nsIAbBooleanConditionString *aCondition, bool aNegate,
key:nsAbOSXUtils::kPropertyMap[i].mOSXKey
value:[NSString stringWithCharacters:reinterpret_cast<const unichar*>(value.get()) length:length]
comparison:comparison];
return NS_OK;
}
}
if (name.EqualsLiteral("DisplayName") && comparison == kABContainsSubString) {
ABSearchElement *first =
[ABPerson searchElementForProperty:kABFirstNameProperty
@ -352,14 +352,14 @@ MapConditionString(nsIAbBooleanConditionString *aCondition, bool aNegate,
key:nil
value:[NSString stringWithCharacters:reinterpret_cast<const unichar*>(value.get()) length:length]
comparison:comparison];
*aResult = [ABSearchElement searchElementForConjunction:kABSearchOr children:[NSArray arrayWithObjects:first, second, third, nil]];
return NS_OK;
}
aCanHandle = false;
return NS_OK;
}
@ -369,32 +369,32 @@ BuildSearchElements(nsIAbBooleanExpression *aExpression,
ABSearchElement **aResult)
{
aCanHandle = true;
nsCOMPtr<nsIArray> expressions;
nsresult rv = aExpression->GetExpressions(getter_AddRefs(expressions));
NS_ENSURE_SUCCESS(rv, rv);
nsAbBooleanOperationType operation;
rv = aExpression->GetOperation(&operation);
NS_ENSURE_SUCCESS(rv, rv);
uint32_t count;
rv = expressions->GetLength(&count);
NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(count > 1 && operation != nsIAbBooleanOperationTypes::NOT,
"This doesn't make sense!");
NSMutableArray *array = nullptr;
if (count > 1)
array = [[NSMutableArray alloc] init];
uint32_t i;
nsCOMPtr<nsIAbBooleanConditionString> condition;
nsCOMPtr<nsIAbBooleanExpression> subExpression;
for (i = 0; i < count; ++i) {
ABSearchElement *element = nullptr;
condition = do_QueryElementAt(expressions, i);
if (condition) {
rv = MapConditionString(condition, operation == nsIAbBooleanOperationTypes::NOT, aCanHandle, &element);
@ -409,21 +409,21 @@ BuildSearchElements(nsIAbBooleanExpression *aExpression,
break;
}
}
if (!aCanHandle) {
// remember to free the array when returning early
[array release];
return NS_OK;
}
if (element) {
if (array)
[array addObject:element];
else
else
*aResult = element;
}
}
if (array) {
if (NS_SUCCEEDED(rv)) {
ABSearchConjunction conjunction = operation == nsIAbBooleanOperationTypes::AND ? kABSearchAnd : kABSearchOr;
@ -431,7 +431,7 @@ BuildSearchElements(nsIAbBooleanExpression *aExpression,
}
[array release];
}
return rv;
}
@ -442,7 +442,7 @@ Search(nsIAbBooleanExpression *aExpression, NSArray **aResult)
ABSearchElement *searchElement;
nsresult rv = BuildSearchElements(aExpression, canHandle, &searchElement);
NS_ENSURE_SUCCESS(rv, false);
if (canHandle)
*aResult = [[ABAddressBook sharedAddressBook] recordsMatchingSearchElement:searchElement];
@ -605,7 +605,7 @@ CheckRedundantCards(nsIAbManager *aManager, nsIAbDirectory *aDirectory,
rv = osxCard->GetURI(uri);
NS_ENSURE_SUCCESS(rv, false);
NSString *uid = [NSString stringWithUTF8String:(uri.get() + 21)];
unsigned int i, count = [aCardList count];
for (i = 0; i < count; ++i) {
if ([[[aCardList objectAtIndex:i] uniqueId] isEqualToString:uid]) {
@ -618,7 +618,7 @@ CheckRedundantCards(nsIAbManager *aManager, nsIAbDirectory *aDirectory,
aManager->NotifyDirectoryItemDeleted(aDirectory, aCard);
return true;
}
return false;
}
@ -655,11 +655,11 @@ nsAbOSXDirectory::Update()
nsresult rv;
nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
if (mIsQueryURI) {
return NS_OK;
}
ABAddressBook *addressBook = [ABAddressBook sharedAddressBook];
// Due to the horrible way the address book code works wrt mailing lists
// we have to use a different list depending on what we are. This pointer
@ -691,7 +691,7 @@ nsAbOSXDirectory::Update()
// For directories, store the cards in mCardList
cardList = mCardList;
}
NSMutableArray *mutableArray = [NSMutableArray arrayWithArray:cards];
uint32_t addressCount;
rv = cardList->GetLength(&addressCount);
@ -706,7 +706,7 @@ nsAbOSXDirectory::Update()
if (CheckRedundantCards(abManager, this, card, mutableArray))
cardList->RemoveElementAt(addressCount);
}
NSEnumerator *enumerator = [mutableArray objectEnumerator];
ABRecord *card;
nsCOMPtr<nsIAbCard> abCard;
@ -722,7 +722,7 @@ nsAbOSXDirectory::Update()
NS_ENSURE_SUCCESS(rv, rv);
AssertCard(abManager, abCard);
}
card = (ABRecord*)[addressBook recordForUniqueId:[NSString stringWithUTF8String:nsAutoCString(Substring(mURINoQuery, 21)).get()]];
NSString * stringValue = [card valueForProperty:kABGroupNameProperty];
if (![stringValue isEqualToString:WrapString(m_ListDirName)])
@ -734,7 +734,7 @@ nsAbOSXDirectory::Update()
abManager->NotifyItemPropertyChanged(supports, "DirName",
oldValue.get(), m_ListDirName.get());
}
if (groups)
{
mutableArray = [NSMutableArray arrayWithArray:groups];
@ -756,7 +756,7 @@ nsAbOSXDirectory::Update()
directory->GetURI(uri);
uri.Cut(0, 21);
NSString *uid = [NSString stringWithUTF8String:uri.get()];
unsigned int j, arrayCount = [mutableArray count];
for (j = 0; j < arrayCount; ++j) {
if ([[[mutableArray objectAtIndex:j] uniqueId] isEqualToString:uid]) {
@ -764,22 +764,22 @@ nsAbOSXDirectory::Update()
break;
}
}
if (j == arrayCount) {
UnassertDirectory(abManager, directory);
}
}
}
enumerator = [mutableArray objectEnumerator];
while ((card = [enumerator nextObject])) {
rv = GetOrCreateGroup([card uniqueId], getter_AddRefs(directory));
NS_ENSURE_SUCCESS(rv, rv);
AssertDirectory(abManager, directory);
}
}
return NS_OK;
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@ -794,31 +794,31 @@ nsAbOSXDirectory::AssertChildNodes()
if (mIsQueryURI || m_IsMailList) {
return NS_OK;
}
nsresult rv;
nsCOMPtr<nsIAbManager> abManager =
do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
NSArray *groups = [[ABAddressBook sharedAddressBook] groups];
unsigned int i, count = [groups count];
if (count > 0 && !m_AddressList) {
m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
nsCOMPtr<nsIAbDirectory> directory;
for (i = 0; i < count; ++i) {
rv = GetOrCreateGroup([[groups objectAtIndex:i] uniqueId],
getter_AddRefs(directory));
NS_ENSURE_SUCCESS(rv, rv);
rv = AssertDirectory(abManager, directory);
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_OK;
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@ -839,7 +839,7 @@ nsAbOSXDirectory::AssertDirectory(nsIAbManager *aManager,
m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
rv = m_AddressList->AppendElement(aDirectory);
NS_ENSURE_SUCCESS(rv, rv);
@ -879,7 +879,7 @@ nsAbOSXDirectory::UnassertCard(nsIAbManager *aManager,
{
nsresult rv;
uint32_t pos;
if (NS_SUCCEEDED(aCardList->IndexOf(0, aCard, &pos)))
rv = aCardList->RemoveElementAt(pos);
@ -906,11 +906,11 @@ NS_IMETHODIMP
nsAbOSXDirectory::GetChildNodes(nsISimpleEnumerator **aNodes)
{
NS_ENSURE_ARG_POINTER(aNodes);
// Queries don't have childnodes.
if (mIsQueryURI || m_IsMailList || !m_AddressList)
return NS_NewEmptyEnumerator(aNodes);
return NS_NewArrayEnumerator(aNodes, m_AddressList);
}
@ -920,7 +920,7 @@ nsAbOSXDirectory::GetChildCards(nsISimpleEnumerator **aCards)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
NS_ENSURE_ARG_POINTER(aCards);
nsresult rv;
NSArray *cards;
if (mIsQueryURI)
@ -929,7 +929,7 @@ nsAbOSXDirectory::GetChildCards(nsISimpleEnumerator **aCards)
rv = nsAbQueryStringToExpression::Convert(mQueryString,
getter_AddRefs(expression));
NS_ENSURE_SUCCESS(rv, rv);
bool canHandle = !m_IsMailList && Search(expression, &cards);
if (!canHandle)
return FallbackSearch(expression, aCards);
@ -939,14 +939,14 @@ nsAbOSXDirectory::GetChildCards(nsISimpleEnumerator **aCards)
else
mCardList->Clear();
NS_ENSURE_SUCCESS(rv, rv);
// The uuid for initializing cards
nsAutoCString ourUuid;
GetUuid(ourUuid);
// Fill the results array and update the card list
unsigned int nbCards = [cards count];
unsigned int i;
nsCOMPtr<nsIAbCard> card;
nsCOMPtr<nsIAbOSXDirectory> rootOSXDirectory;
@ -1179,7 +1179,7 @@ nsAbOSXDirectory::HasDirectory(nsIAbDirectory *aDirectory,
{
NS_ENSURE_ARG_POINTER(aDirectory);
NS_ENSURE_ARG_POINTER(aHasDirectory);
*aHasDirectory = false;
uint32_t pos;
@ -1203,7 +1203,7 @@ nsAbOSXDirectory::OnSearchFoundCard(nsIAbCard *aCard)
m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
if (!mCardList) {
mCardList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -1211,14 +1211,14 @@ nsAbOSXDirectory::OnSearchFoundCard(nsIAbCard *aCard)
rv = m_AddressList->AppendElement(aCard);
NS_ENSURE_SUCCESS(rv, rv);
rv = mCardList->AppendElement(aCard);
NS_ENSURE_SUCCESS(rv, rv);
nsAutoCString ourUuid;
GetUuid(ourUuid);
aCard->SetDirectoryId(ourUuid);
return NS_OK;
}
@ -1227,13 +1227,13 @@ nsAbOSXDirectory::FallbackSearch(nsIAbBooleanExpression *aExpression,
nsISimpleEnumerator **aCards)
{
nsresult rv;
if (mCardList)
rv = mCardList->Clear();
else
mCardList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
if (m_AddressList) {
m_AddressList->Clear();
}
@ -1241,14 +1241,14 @@ nsAbOSXDirectory::FallbackSearch(nsIAbBooleanExpression *aExpression,
m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
nsCOMPtr<nsIAbDirectoryQueryArguments> arguments =
do_CreateInstance(NS_ABDIRECTORYQUERYARGUMENTS_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = arguments->SetExpression(aExpression);
NS_ENSURE_SUCCESS(rv, rv);
// Don't search the subdirectories. If the current directory is a mailing
// list, it won't have any subdirectories. If the current directory is an
// addressbook, searching both it and the subdirectories (the mailing
@ -1256,7 +1256,7 @@ nsAbOSXDirectory::FallbackSearch(nsIAbBooleanExpression *aExpression,
// list will be an entry in the parent addressbook.
rv = arguments->SetQuerySubDirectories(false);
NS_ENSURE_SUCCESS(rv, rv);
// Get the directory without the query
nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -1266,17 +1266,17 @@ nsAbOSXDirectory::FallbackSearch(nsIAbBooleanExpression *aExpression,
NS_ENSURE_SUCCESS(rv, rv);
// Initiate the proxy query with the no query directory
nsCOMPtr<nsIAbDirectoryQueryProxy> queryProxy =
nsCOMPtr<nsIAbDirectoryQueryProxy> queryProxy =
do_CreateInstance(NS_ABDIRECTORYQUERYPROXY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = queryProxy->Initiate();
NS_ENSURE_SUCCESS(rv, rv);
int32_t context = 0;
rv = queryProxy->DoQuery(directory, arguments, this, -1, 0, &context);
NS_ENSURE_SUCCESS(rv, rv);
return NS_NewArrayEnumerator(aCards, m_AddressList);
}

4
mailnews/base/content/folderWidgets.xml
Просмотреть файл

@ -214,7 +214,7 @@
if (this._menu._teardown)
this._menu._teardown();
},
OnItemRemoved: function act_remove(aRDFParentItem, aItem) {
if (!(aItem instanceof Ci.nsIMsgFolder))
return;
@ -293,7 +293,7 @@
}
})]]></field>
<!--
<!--
- True if we have already built our menu-items and are now just
- listening for changes
-->

2
mailnews/base/content/junkMailInfo.xul
Просмотреть файл

@ -12,7 +12,7 @@
]>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
<dialog id="junkMailInfo"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

2
mailnews/base/content/msgAccountCentral.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

8
mailnews/base/content/shutdownWindow.xul
Просмотреть файл

@ -15,17 +15,17 @@
<script type="application/javascript" src="chrome://messenger/content/shutdownWindow.js"/>
<stringbundle id="bundle_shutdown" src="chrome://messenger/locale/shutdownWindow.properties"/>
<vbox align="center">
<label id="shutdownStatus_label" value="" />
<separator class="thin" />
</vbox>
<progressmeter id="shutdown_progressmeter" mode="determined" />
<vbox align="center">
<label id="shutdownTask_label" value="" />
<separator class="thick" />
</vbox>
</dialog>

14
mailnews/base/prefs/content/AccountWizard.xul
Просмотреть файл

@ -48,7 +48,7 @@
label="&accountTypeMail.label;" accesskey="&accountTypeMail.accesskey;"
selected="true"/>
#endif
<vbox datasources="rdf:ispdefaults"
<vbox datasources="rdf:ispdefaults"
containment="http://home.netscape.com/NC-rdf#providers"
id="ispBox"
ref="NC:ispinfo">
@ -82,14 +82,14 @@
accesskey="&fullnameLabel.accesskey;" control="fullName"/>
<textbox mailtype="identity" wsm_persist="true" name="fullName" id="fullName" flex="1" oninput="identityPageValidate();"/>
</hbox>
<separator/>
<separator/>
<grid>
<columns>
<column flex="1"/>
</columns>
<rows>
<row>
<description id="emailDescText"/>
<description id="emailDescText"/>
</row>
<separator class="thin"/>
<row>
@ -124,12 +124,12 @@
<hbox align="center" class="serverDataBox">
<!-- The initial value for the servertype radiogroup is set in onInit() -->
<radiogroup id="servertype" wsm_persist="true" orient="horizontal">
<radio group="servertype" value="pop3" id="pop3" label="&popType.label;"
<radio group="servertype" value="pop3" id="pop3" label="&popType.label;"
wsm_persist="true" oncommand="setServerType();" accesskey="&popType.accesskey;"/>
<radio group="servertype" value="imap" id="imap" label="&imapType.label;"
wsm_persist="true" oncommand="setServerType();" accesskey="&imapType.accesskey;"/>
</radiogroup>
<label id="serverPortLabel" control="serverPort"
<label id="serverPortLabel" control="serverPort"
accesskey="&portNum.accesskey;"
value="&portNum.label;"/>
<textbox id="serverPort" type="number" size="3" max="65535"/>
@ -268,7 +268,7 @@
<!-- Account name page : User gets a choice to enter a pretty name for the account -->
<!-- Defaults : Mail account -> Email address, Newsgroup account -> Newsgroup server name -->
<wizardpage id="accnamepage" pageid="accnamepage"
<wizardpage id="accnamepage" pageid="accnamepage"
label="&accnameTitle.label;"
onpageshow="return acctNamePageInit();"
onpageadvanced="return acctNamePageUnload();">
@ -284,7 +284,7 @@
</wizardpage>
<!-- Done page : this page summarizes information collected to create a mail/news account -->
<wizardpage id="done" pageid="done"
<wizardpage id="done" pageid="done"
label="&completionTitle.label;"
onpageshow="return donePageInit();">
<vbox flex="1">

4
mailnews/base/prefs/content/am-offline.xul
Просмотреть файл

@ -11,13 +11,13 @@
onload="parent.onPanelLoaded('am-offline.xul');">
<vbox flex="1" style="overflow: auto;">
<stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
<stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
<script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
<script type="application/javascript" src="chrome://messenger/content/retention.js"/>
<script type="application/javascript" src="chrome://messenger/content/am-offline.js"/>
<label hidden="true" wsm_persist="true" id="server.type"/>
<label hidden="true" wsm_persist="true" id="server.type"/>
<label id="imap.autoSyncMaxAgeDays" hidden="true"
wsm_persist="true" preftype="int"
prefstring="mail.server.%serverkey%.autosync_max_age_days"/>

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

@ -118,7 +118,7 @@ static void openMailWindow(const nsCString& aUri)
if (NS_FAILED(rv))
return;
nsCOMPtr<nsIMsgDBHdr> msgHdr;
nsCOMPtr<nsIMsgDBHdr> msgHdr;
messenger->MsgHdrFromURI(aUri, getter_AddRefs(msgHdr));
if (msgHdr)
{
@ -221,7 +221,7 @@ nsMessengerOSXIntegration::Observe(nsISupports* aSubject, const char* aTopic, co
#ifdef MOZ_SUITE
// SeaMonkey does most of the GUI work in JS code when clicking on a mail
// notification, so it needs an extra function here
// notification, so it needs an extra function here
if (!strcmp(aTopic, "alertclicksimplecallback"))
return OnAlertClickedSimple();
#endif

14
mailnews/build/nsMailModule.cpp
Просмотреть файл

@ -6,26 +6,26 @@
/* ****************************************************************************
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
*
*
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
*
*
* Dear Mortals,
*
*
* Please be advised that if you are adding something here, you should also
* strongly consider adding it to the other place it goes too! These can be
* found in paths like so: mailnews/.../build/WhateverFactory.cpp
*
*
* If you do not, your (static) release builds will be quite pleasant, but
* (dynamic) debug builds will disappoint you by not having your component in
* them.
*
*
* Yours truly,
* The ghost that haunts the MailNews codebase.
*
*
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
*
*
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION!
* ****************************************************************************/

2
mailnews/compose/content/sendProgress.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this

54
mailnews/db/gloda/content/glodacomplete.xml
Просмотреть файл

@ -305,7 +305,7 @@
this._adjustAcItem();
]]>
</constructor>
<property name="label" readonly="true">
<getter>
<![CDATA[
@ -313,7 +313,7 @@
]]>
</getter>
</property>
<method name="_adjustAcItem">
<body>
<![CDATA[
@ -339,7 +339,7 @@
this._adjustAcItem();
]]>
</constructor>
<property name="label" readonly="true">
<getter>
<![CDATA[
@ -347,7 +347,7 @@
]]>
</getter>
</property>
<method name="_adjustAcItem">
<body>
<![CDATA[
@ -370,7 +370,7 @@
this._adjustAcItem();
]]>
</constructor>
<property name="label" readonly="true">
<getter>
<![CDATA[
@ -378,7 +378,7 @@
]]>
</getter>
</property>
<method name="_adjustAcItem">
<body>
<![CDATA[
@ -441,13 +441,13 @@
this._nameBox = document.getAnonymousElementByAttribute(this, "anonid", "name-box");
this._name = document.getAnonymousElementByAttribute(this, "anonid", "name");
this._picture = document.getAnonymousElementByAttribute(this, "anonid", "picture");
this._adjustAcItem();
]]>
</constructor>
<property name="label" readonly="true">
<getter>
<![CDATA[
@ -456,18 +456,18 @@
]]>
</getter>
</property>
<method name="_adjustAcItem">
<body>
<![CDATA[
var identity = this.row.item;
if (identity == null)
return;
// I guess we should get the picture size from CSS or something?
this._picture.src = identity.pictureURL(32);
// Emphasize the matching search terms for the description
this._setUpDescription(this._name, identity.contact.name);
this._setUpDescription(this._identity, identity.value);
@ -531,13 +531,13 @@
this._nameBox = document.getAnonymousElementByAttribute(this, "anonid", "name-box");
this._name = document.getAnonymousElementByAttribute(this, "anonid", "name");
this._picture = document.getAnonymousElementByAttribute(this, "anonid", "picture");
this._adjustAcItem();
]]>
</constructor>
<property name="label" readonly="true">
<getter>
<![CDATA[
@ -546,20 +546,20 @@
]]>
</getter>
</property>
<method name="_adjustAcItem">
<body>
<![CDATA[
var contact = this.obj;
if (contact == null)
return;
var identity = contact.identities[0];
// I guess we should get the picture size from CSS or something?
this._picture.src = identity.pictureURL(32);
// Emphasize the matching search terms for the description
this._setUpDescription(this._name, contact.name);
this._setUpDescription(this._identity, identity.value);
@ -589,7 +589,7 @@
this._adjustAcItem();
]]>
</constructor>
<property name="label" readonly="true">
<getter>
<![CDATA[
@ -597,36 +597,36 @@
]]>
</getter>
</property>
<method name="renderItem">
<parameter name="aObj"/>
<body>
var node = document.createElementNS(
"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
"richlistitem");
node.obj = aObj;
node.setAttribute("type",
"gloda-" + this.row.nounDef.name + "-chunk");
this._identityHolder.appendChild(node);
</body>
</method>
<method name="_adjustAcItem">
<body>
<![CDATA[
// clear out any lingering children
while (this._identityHolder.hasChildNodes())
this._identityHolder.lastChild.remove();
var row = this.row;
if (row == null)
return;
this._explanation.value = row.nounDef.name + "s " +
row.criteriaType + "ed " + row.criteria;
// render anyone already in there
for (let item of row.collection.items) {
this.renderItem(item);

14
mailnews/extensions/dsn/content/am-dsn.xul
Просмотреть файл

@ -10,13 +10,13 @@
<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-dsn.dtd">
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.onPanelLoaded('am-dsn.xul');">
<stringbundle id="bundle_smime" src="chrome://messenger/locale/am-dsn.properties"/>
<stringbundle id="bundle_smime" src="chrome://messenger/locale/am-dsn.properties"/>
<script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
<script type="application/javascript" src="chrome://messenger/content/am-dsn.js"/>
<dialogheader title="&pane.title;"/>
<groupbox>
@ -26,16 +26,16 @@
<hbox id="prefChoices" align="center">
<radiogroup id="identity.dsn_use_custom_prefs"
wsm_persist="true"
genericattr="true"
genericattr="true"
preftype="bool"
prefstring="mail.identity.%identitykey%.dsn_use_custom_prefs"
prefstring="mail.identity.%identitykey%.dsn_use_custom_prefs"
oncommand="EnableDisableCustomSettings();">
<radio id="identity.select_global_prefs"
value="false"
label="&useGlobalPrefs.label;"
accesskey="&useGlobalPrefs.accesskey;"/>
<radio id="identity.select_custom_prefs"
value="true"
label="&useCustomPrefs.label;"

2
mailnews/extensions/smime/content/certFetchingStatus.xul
Просмотреть файл

@ -9,7 +9,7 @@
<!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/certFetchingStatus.dtd">
<dialog id="certFetchingStatus" title="&title.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 50em;"
buttons="cancel"
buttonlabelcancel="&stop.label;"

4
mailnews/extensions/smime/content/msgCompSecurityInfo.xul
Просмотреть файл

@ -9,7 +9,7 @@
<!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/msgCompSecurityInfo.dtd">
<dialog id="msgCompSecurityInfo" title="&title.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 50em;"
persist="width height"
buttons="accept"
@ -17,7 +17,7 @@
<script type="application/javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
<stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/>
<stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/>
<description>&subject.plaintextWarning;</description>
<separator class="thin"/>

4
mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.xul
Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?>
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

2
mailnews/extensions/smime/content/msgReadSMIMEOverlay.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

6
mailnews/extensions/smime/content/msgReadSecurityInfo.xul
Просмотреть файл

@ -4,19 +4,19 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSecurityInfo.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSecurityInfo.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/msgReadSecurityInfo.dtd">
<dialog id="msgReadSecurityInfo" title="&status.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 40em;"
buttons="accept"
onload="onLoad();">
<script type="application/javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
<stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/>
<stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/>
<vbox flex="1">
<label id="signatureLabel"/>

30
mailnews/import/applemail/src/nsEmlxHelperUtils.mm
Просмотреть файл

@ -21,12 +21,12 @@
#import <Cocoa/Cocoa.h>
nsresult nsEmlxHelperUtils::ConvertToMozillaStatusFlags(const char *aXMLBufferStart,
const char *aXMLBufferEnd,
nsresult nsEmlxHelperUtils::ConvertToMozillaStatusFlags(const char *aXMLBufferStart,
const char *aXMLBufferEnd,
uint32_t *aMozillaStatusFlags)
{
// create a NSData wrapper around the buffer, so we can use the Cocoa call below
NSData *metadata =
NSData *metadata =
[[[NSData alloc] initWithBytesNoCopy:(void *)aXMLBufferStart length:(aXMLBufferEnd-aXMLBufferStart) freeWhenDone:NO] autorelease];
// get the XML data as a dictionary
@ -45,7 +45,7 @@ nsresult nsEmlxHelperUtils::ConvertToMozillaStatusFlags(const char *aXMLBufferSt
if (emlxMessageFlags == 0)
return NS_ERROR_FAILURE;
if (emlxMessageFlags & nsEmlxHelperUtils::kRead)
if (emlxMessageFlags & nsEmlxHelperUtils::kRead)
*aMozillaStatusFlags |= nsMsgMessageFlags::Read;
if (emlxMessageFlags & nsEmlxHelperUtils::kForwarded)
*aMozillaStatusFlags |= nsMsgMessageFlags::Forwarded;
@ -67,7 +67,7 @@ nsresult nsEmlxHelperUtils::ConvertToMboxRD(const char *aMessageBufferStart, con
const char *foundFromStr = strnstr(cur, "From ", aMessageBufferEnd-cur);
if (foundFromStr) {
// skip all prepending '>' chars
// skip all prepending '>' chars
const char *fromLineStart = foundFromStr;
while (fromLineStart-- >= aMessageBufferStart) {
if (*fromLineStart == '\n' || fromLineStart == aMessageBufferStart) {
@ -85,7 +85,7 @@ nsresult nsEmlxHelperUtils::ConvertToMboxRD(const char *aMessageBufferStart, con
// look for more From lines.
continue;
}
}
break;
}
@ -119,7 +119,7 @@ nsresult nsEmlxHelperUtils::AddEmlxMessageToStream(nsIFile *aMessage, nsIOutputS
nsAutoCString path;
aMessage->GetNativePath(path);
NSData *data = [NSData dataWithContentsOfFile:[NSString stringWithUTF8String:path.get()]];
NSData *data = [NSData dataWithContentsOfFile:[NSString stringWithUTF8String:path.get()]];
if (!data) {
[pool release];
return NS_ERROR_FAILURE;
@ -137,7 +137,7 @@ nsresult nsEmlxHelperUtils::AddEmlxMessageToStream(nsIFile *aMessage, nsIOutputS
// -------------------------------
// read the first line of the emlx file, which is a number of how many bytes ahead the actual
// message data is.
// message data is.
uint64_t numberOfBytesToRead = strtol((char *)[data bytes], &startOfMessageData, 10);
if (numberOfBytesToRead <= 0 || !startOfMessageData) {
[pool release];
@ -145,9 +145,9 @@ nsresult nsEmlxHelperUtils::AddEmlxMessageToStream(nsIFile *aMessage, nsIOutputS
}
// skip whitespace
while (*startOfMessageData == ' ' ||
*startOfMessageData == '\n' ||
*startOfMessageData == '\r' ||
while (*startOfMessageData == ' ' ||
*startOfMessageData == '\n' ||
*startOfMessageData == '\r' ||
*startOfMessageData == '\t')
++startOfMessageData;
@ -182,15 +182,15 @@ nsresult nsEmlxHelperUtils::AddEmlxMessageToStream(nsIFile *aMessage, nsIOutputS
[pool release];
return rv;
}
// write out X-Mozilla-Keywords header as well to reserve some space for it
// write out X-Mozilla-Keywords header as well to reserve some space for it
// in the mbox file.
rv = aOut->Write(X_MOZILLA_KEYWORDS, X_MOZILLA_KEYWORDS_LEN, &dummyRv);
if (NS_FAILED(rv)) {
[pool release];
return rv;
}
// write out empty X-Mozilla_status2 header
buf.Adopt(PR_smprintf(X_MOZILLA_STATUS2_FORMAT MSG_LINEBREAK, 0));
NS_ASSERTION(!buf.IsEmpty(), "printf error with X-Mozilla-Status2 header");
@ -204,7 +204,7 @@ nsresult nsEmlxHelperUtils::AddEmlxMessageToStream(nsIFile *aMessage, nsIOutputS
[pool release];
return rv;
}
// do any conversion needed for the mbox data to be valid mboxrd.
nsCString convertedData;
rv = ConvertToMboxRD(startOfMessageData, (startOfMessageData + numberOfBytesToRead), convertedData);

8
mailnews/import/content/fieldMapImport.xul
Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/fieldMapImport.dtd">
@ -23,9 +23,9 @@
<button id="previous" oncommand="Browse(-1);"
label="&fieldMapImport.previous.label;"
accesskey="&fieldMapImport.previous.accesskey;"/>
<button id="next" oncommand="Browse(1);"
<button id="next" oncommand="Browse(1);"
label="&fieldMapImport.next.label;"
accesskey="&fieldMapImport.next.accesskey;"/>
accesskey="&fieldMapImport.next.accesskey;"/>
</hbox>
<hbox align="center">