From 1a0473e6616a4b3f5ca5154d32f712b4aa860600 Mon Sep 17 00:00:00 2001
From: Mark Banner <bugzilla@standard8.plus.com>
Date: Thu, 18 Sep 2008 18:04:22 +0100
Subject: [PATCH] First part of Bug 451143 Print Preview Card and Abook both
 unuseable - fix some js/xul coding errors in AB card print preview. Still
 won't be useable yet. r/sr=bienvenu

---
 mail/components/addrbook/content/addressbook.xul | 2 +-
 mailnews/addrbook/src/nsAbCardProperty.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail/components/addrbook/content/addressbook.xul b/mail/components/addrbook/content/addressbook.xul
index c1048e22dd..e2c8a684a9 100644
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -111,7 +111,7 @@
               events="focus"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
     <command id="cmd_newlist" oncommand="goDoCommand('cmd_newlist');"/>
-    <command id="cmd_printcardpreview" oncommand="AbPrintCardPreview();"/>
+    <command id="cmd_printcardpreview" oncommand="AbPrintPreviewCard();"/>
     <command id="cmd_printcard" oncommand="AbPrintCard();"/>
     <command id="cmd_properties" oncommand="goDoCommand('button_edit');"/>
     <command id="cmd_undo" oncommand="goDoCommand('cmd_undo')" disabled="true"/>
diff --git a/mailnews/addrbook/src/nsAbCardProperty.cpp b/mailnews/addrbook/src/nsAbCardProperty.cpp
index 855e15397e..dd381f7f0c 100644
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -453,7 +453,7 @@ NS_IMETHODIMP nsAbCardProperty::Equals(nsIAbCard *card, PRBool *result)
 // XXX: Use the category manager instead of this file to implement these
 NS_IMETHODIMP nsAbCardProperty::TranslateTo(const nsACString &type, nsACString &result)
 {
-  if (type.EqualsLiteral("base64"))
+  if (type.EqualsLiteral("base64xml"))
     return ConvertToBase64EncodedXML(result);
   else if (type.EqualsLiteral("xml"))
   {