Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #379070 --> make address book and mailnews\basensEscape free, use the new eqivalents that are available via frozen linkage.

Browse Source 
Patch by Prasad <prasad@medhas.org>

sr=mscott


git-svn-id: svn://10.0.0.236/trunk@241165 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2007-12-13 22:33:27 +00:00
parent cd11edfc57
commit 4df1437fce
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/mailnews/addrbook/src/nsAbManager.cpp
View File

@@ -52,6 +52,7 @@
#include "msgCore.h"
#include "nsMsgI18N.h"
#include "nsIStringBundle.h"
#include "nsMsgUtils.h"
#include "plstr.h"
#include "prmem.h"
@@ -78,7 +79,6 @@
#include "plbase64.h"
#include "nsIWindowWatcher.h"
#include "nsEscape.h"
#include "nsVCard.h"
#include "nsVCardObj.h"
#include "nsISupportsPrimitives.h"
@@ -1079,10 +1079,11 @@ NS_IMETHODIMP nsAddressBook::HandleContent(const char * aContentType,
const char *startOfVCard = strstr(path.get(), "add?vcard=");
if (startOfVCard)
{
char *unescapedData = PL_strdup(startOfVCard + strlen("add?vcard="));
nsCString unescapedData;
// XXX todo, explain why we is escaped twice
nsUnescape(unescapedData);
MsgUnescapeString(nsDependentCString(startOfVCard + strlen("add?vcard=")),
0, unescapedData);
if (!aWindowContext)
return NS_ERROR_FAILURE;
@@ -1092,7 +1093,7 @@ NS_IMETHODIMP nsAddressBook::HandleContent(const char * aContentType,
return NS_ERROR_FAILURE;
nsCOMPtr <nsIAbCard> cardFromVCard;
rv = EscapedVCardToAbCard((const char *)unescapedData, getter_AddRefs(cardFromVCard));
rv = EscapedVCardToAbCard(unescapedData.get(), getter_AddRefs(cardFromVCard));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsISupportsInterfacePointer> ifptr =
@@ -1110,8 +1111,6 @@ NS_IMETHODIMP nsAddressBook::HandleContent(const char * aContentType,
NS_LITERAL_STRING("chrome,resizable=no,titlebar,modal,centerscreen"),
ifptr, getter_AddRefs(dialogWindow));
NS_ENSURE_SUCCESS(rv, rv);
PL_strfree(unescapedData);
}
rv = NS_OK;
}
@@ -1189,13 +1188,10 @@ NS_IMETHODIMP nsAddressBook::EscapedVCardToAbCard(const char *aEscapedVCardStr,
// aEscapedVCardStr will be "" the first time, before you have a vCard
if (*aEscapedVCardStr != '\0') {
char *unescapedData = PL_strdup(aEscapedVCardStr);
if (!unescapedData)
return NS_ERROR_OUT_OF_MEMORY;
nsCString unescapedData;
MsgUnescapeString(nsDependentCString(aEscapedVCardStr), 0, unescapedData);
nsUnescape(unescapedData);
VObject *vObj = parse_MIME(unescapedData, strlen(unescapedData));
PL_strfree(unescapedData);
VObject *vObj = parse_MIME(unescapedData.get(), unescapedData.Length());
NS_ASSERTION(vObj, "Parse of vCard failed");
convertFromVObject(vObj, cardFromVCard);