зеркало из https://github.com/mozilla/pjs.git
supplimental fix for bug #142845. when printing cards, print out the newly added screenname attribute. r/sr=bienvenu
This commit is contained in:
Родитель
e075140c8d
Коммит
d3fbc32ae3
|
@ -78,7 +78,8 @@ static AppendItem NAME_ATTRS_ARRAY[] = {
|
|||
{kDisplayNameColumn, "propertyDisplayName", AppendLabel},
|
||||
{kNicknameColumn, "propertyNickname", AppendLabel},
|
||||
{kPriEmailColumn, "", AppendLine},
|
||||
{k2ndEmailColumn, "", AppendLine}
|
||||
{k2ndEmailColumn, "", AppendLine},
|
||||
{kAimScreenNameColumn, "propertyScreenName", AppendLabel},
|
||||
};
|
||||
|
||||
static AppendItem PHONE_ATTRS_ARRAY[] = {
|
||||
|
@ -1280,7 +1281,6 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToBase64EncodedXML(char **result)
|
|||
|
||||
xmlStr.Append(NS_LITERAL_STRING("<?xml version=\"1.0\"?>\n").get());
|
||||
xmlStr.Append(NS_LITERAL_STRING("<?xml-stylesheet type=\"text/css\" href=\"chrome://messenger/content/addressbook/print.css\"?>\n").get());
|
||||
|
||||
xmlStr.Append(NS_LITERAL_STRING("<directory>\n").get());
|
||||
|
||||
// Get Address Book string and set it as title of XML document
|
||||
|
@ -1299,7 +1299,6 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToBase64EncodedXML(char **result)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
nsXPIDLString xmlSubstr;
|
||||
rv = ConvertToXMLPrintData(getter_Copies(xmlSubstr));
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
|
Загрузка…
Ссылка в новой задаче