X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconvert.cpp;h=1f19d97b9a6549a4856ca893eeea513cc2232316;hb=a45c3a46e4e37da415a8b8da2aaabe6a4abc4551;hp=0cfaa9f352e8c4ef153aa37d62c4d48f3c24c9f7;hpb=0177e3dca8765fcab7ca524f3ba0f243a972fdfb;p=xestiaab%2F.git

diff --git a/source/convert.cpp b/source/convert.cpp
index 0cfaa9f..1f19d97 100644
--- a/source/convert.cpp
+++ b/source/convert.cpp
@@ -136,9 +136,6 @@ ConvertResult ConvertContact(wxString InputFormat, wxString OutputFormat,
 		if (vCard4Format.Get("VERSION") != "4.0"){
 			return CONVERTRESULT_INPUTFILEINVALIDFORMAT;
 		}
-		
-		// No conversion needs to be as the card is already
-		// in the vCard 4.0 format.
 	
 	} else if (InputFormat == "vCard3"){
 	
@@ -154,7 +151,15 @@ ConvertResult ConvertContact(wxString InputFormat, wxString OutputFormat,
 		if (InputvCard.Get("VERSION") != "3.0"){
 			return CONVERTRESULT_INPUTFILEINVALIDFORMAT;
 		}
-	
+
+		vCard34Conv vCard34ConvObj;
+		
+		vCard vCard4Format;
+		
+		vCard34ConvObj.ConvertToV4(&InputFileData, &vCard4Format);
+		
+		FinalData = vCard4Format.WriteString();
+		
 	}
 	
 	// Convert the vCard into the required format and
@@ -188,7 +193,8 @@ ConvertResult ConvertContact(wxString InputFormat, wxString OutputFormat,
 	} else {
 	
 		// Write out the data to the console.
-	
+		
+		FinalData.Trim();
 		std::cout << FinalData << std::endl;
 	
 	}