X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-connect.cpp;h=71134e78d7cc4002bfd9037c55a4fe2af9fa09d3;hb=71b5282bb2ee3a21c714c005a99cb9d859991586;hp=0f7ec5c5aeb9a7a071330272a39e7943550f0ab2;hpb=11d1592bfb434c97350ca31bf8f13c85e2249adb;p=xestiaab%2F.git

diff --git a/source/carddav/carddav-connect.cpp b/source/carddav/carddav-connect.cpp
index 0f7ec5c..71134e7 100644
--- a/source/carddav/carddav-connect.cpp
+++ b/source/carddav/carddav-connect.cpp
@@ -72,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 {
@@ -147,6 +131,8 @@ bool CardDAV::Connect(){
 			curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
 		}
 
+                SetConnectionObject(conn);
+        
 		conncode = (curl_easy_perform(conn));
 		
 		ptr.certdata = NULL;