From dbd3c9a276ac5f7171006b42f2e7105b04b51444 Mon Sep 17 00:00:00 2001 From: "rhp%netscape.com" Date: Tue, 8 Aug 2000 00:52:52 +0000 Subject: [PATCH] Fix for vCard having an inactive Add button - Bug #: 47537 - r: putterman --- mailnews/mime/cthandlers/vcard/mimevcrd.cpp | 25 ++++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp index e07c69df6fa..4a8ec9f84b3 100644 --- a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp +++ b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp @@ -1017,20 +1017,19 @@ static int OutputButtons(MimeObject *obj, PRBool basic, VObject *v) PR_FREEIF(rsrcString); +/**** RICHIE: When we get the addbook:add protocol into the product, we need to turn this stuff back on! rsrcString = VCardGetStringByID(VCARD_MSG_ADD_TO_ADDR_BOOK); - // RICHIE - Once this is completed in the back end, we can enable the button again - // htmlLine2 = PR_smprintf ("
", - // vEscCard, rsrcString); - htmlLine2 = PR_smprintf ("
", - vEscCard, rsrcString); - + htmlLine2 = PR_smprintf ("
", + vEscCard, rsrcString); PR_FREEIF(rsrcString); if (!htmlLine1 && !htmlLine2) - { +******/ + if (!htmlLine1) + { nsCRT::free (vEscCard); PR_FREEIF (htmlLine1); - PR_FREEIF (htmlLine2); + // PR_FREEIF (htmlLine2); return VCARD_OUT_OF_MEMORY; } @@ -1054,15 +1053,19 @@ static int OutputButtons(MimeObject *obj, PRBool basic, VObject *v) status = WriteEachLineToStream (obj, "\")"); if (status < 0) goto FAIL; - status = WriteLineToStream (obj, htmlLine2, PR_FALSE); - if (status < 0) goto FAIL; + // RICHIE - this goes back in when the addcard feature is done! + // status = WriteLineToStream (obj, htmlLine2, PR_FALSE); + // if (status < 0) goto FAIL; + status = OutputTableRowOrData (obj, PR_FALSE, PR_TRUE, NULL, NULL, NULL, NULL); if (status < 0) goto FAIL; FAIL: PR_FREEIF (vEscCard); PR_FREEIF (htmlLine1); - PR_FREEIF (htmlLine2); + + // RICHIE - this goes back in when the addcard feature is done! + // PR_FREEIF (htmlLine2); return status; }