From f5192e5abfa68e9a8996bf6e564e76efdc88751c Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.plus.com"
 <bugzilla%standard8.plus.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 13 Dec 2007 22:33:32 +0000
Subject: [PATCH] Bug 395939 nsIAddressBook::convert4xVCardPrefs is unused.
 r/sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@241170 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/addrbook/public/nsIAbManager.idl |  3 +-
 mozilla/mailnews/addrbook/src/nsAbManager.cpp | 28 -------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/mozilla/mailnews/addrbook/public/nsIAbManager.idl b/mozilla/mailnews/addrbook/public/nsIAbManager.idl
index 6e2de1b8ffe..3188ba6fd81 100644
--- a/mozilla/mailnews/addrbook/public/nsIAbManager.idl
+++ b/mozilla/mailnews/addrbook/public/nsIAbManager.idl
@@ -44,7 +44,7 @@ interface nsIAbDirectoryProperties;
 interface nsISupportsArray;
 interface nsIRDFDataSource;
 
-[scriptable, uuid(70ed1e50-4824-443f-aaea-c0efb7f2ec1a)]
+[scriptable, uuid(567584de-4bc3-431e-ac21-659a38ca5fa6)]
 interface nsIAddressBook : nsISupports 
 {
   /**
@@ -66,6 +66,5 @@ interface nsIAddressBook : nsISupports
   boolean mailListNameExists(in wstring name);
   nsIAbCard escapedVCardToAbCard(in string escapedVCardStr);
   string abCardToEscapedVCard(in nsIAbCard aCard);
-  void convert4xVCardPrefs(in string prefRoot, out string escapedVCardStr);
 };
 
diff --git a/mozilla/mailnews/addrbook/src/nsAbManager.cpp b/mozilla/mailnews/addrbook/src/nsAbManager.cpp
index b289a6b03cb..2830d3f3f37 100644
--- a/mozilla/mailnews/addrbook/src/nsAbManager.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbManager.cpp
@@ -1207,34 +1207,6 @@ static nsresult addProperty(char **currentVCard, const char *currentRoot, const
     return NS_OK;
 }
 
-NS_IMETHODIMP nsAddressBook::Convert4xVCardPrefs(const char *prefRoot, char **escapedVCardStr)
-{
-    NS_ENSURE_ARG_POINTER(prefRoot);
-    NS_ENSURE_ARG_POINTER(escapedVCardStr);
-
-    char *vCardString = nsnull;
-    vCardString = PL_strdup("begin:vcard \n");
-
-    nsresult rv = addProperty(&vCardString, prefRoot, prefRoot);
-    NS_ENSURE_SUCCESS(rv,rv);
-
-    char *vcard = PR_smprintf("%send:vcard\n", vCardString);
-    PR_FREEIF(vCardString);
-
-    VObject *vObj = parse_MIME(vcard, strlen(vcard));
-    PR_FREEIF(vcard);
-
-    nsCOMPtr<nsIAbCard> cardFromVCard = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID);
-    convertFromVObject(vObj, cardFromVCard);
-
-    if (vObj)
-        cleanVObject(vObj);
-
-    rv = cardFromVCard->ConvertToEscapedVCard(escapedVCardStr);
-    NS_ENSURE_SUCCESS(rv,rv);
-    return rv;
-}
-
 NS_IMETHODIMP
 nsAddressBook::Handle(nsICommandLine* aCmdLine)
 {