X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-connect.cpp;h=71134e78d7cc4002bfd9037c55a4fe2af9fa09d3;hb=4e8ed32926425840c4367d90a9145ded0d65dc2a;hp=98256e5b38add00e24858f7f526b1468de1a074e;hpb=9bb2fe74bfed060ee6ee764ea8ed95c25e3e0446;p=xestiaab%2F.git

diff --git a/source/carddav/carddav-connect.cpp b/source/carddav/carddav-connect.cpp
index 98256e5..71134e7 100644
--- a/source/carddav/carddav-connect.cpp
+++ b/source/carddav/carddav-connect.cpp
@@ -30,6 +30,8 @@
 
 bool CardDAV::Connect(){
 
+	// Connect to the CardDAV server.
+	
 	PageData.Clear();
 	PageHeader.Clear();
 
@@ -70,22 +72,6 @@ bool CardDAV::Connect(){
 	
 	// Try SSL first.
 
-
-	/*
-	char *ServerAdrSSLChar = new char[(ServerAddressSSL.Length() - 1)];
-	//memset(ServerAdrSSLChar, 0, ServerAddressSSL.Length());
-	strncpy(ServerAdrSSLChar, (const char*)ServerAddressSSL.mb_str(wxConvUTF8), (ServerAddressSSL.Length() - 1));
-	
-	char *ServerAdrNorChar = new char[(ServerAddressNormal.Length() - 1)];
-	//memset(ServerAdrNorChar, 0, ServerAddressSSL.Length());	
-	strncpy(ServerAdrNorChar, (const char*)ServerAddressNormal.mb_str(wxConvUTF8), (ServerAddressNormal.Length() - 1));
-
-	char *ServerAuthChar = new char[(ServerAuth.Length() - 1)];
-	//memset(ServerAuthChar, 0, ServerAddressSSL.Length());	
-	strncpy(ServerAuthChar, (const char*)ServerAuth.mb_str(wxConvUTF8), (ServerAuth.Length() - 1));
-	
-	*/
-	
 	if (ServerSSL){
 
 		union {
@@ -145,6 +131,8 @@ bool CardDAV::Connect(){
 			curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
 		}
 
+                SetConnectionObject(conn);
+        
 		conncode = (curl_easy_perform(conn));
 		
 		ptr.certdata = NULL;