X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-servercontact.cpp;h=1ebc1dfedec5e5712f17c90589897bc866233370;hb=66e841c8847db860ad378b330ae5344554f53d35;hp=a5771c21fd12f716fabe29871a7696e07cb2cf68;hpb=d269265a68b0d6fd90304e98d3ecab5d699e9a15;p=xestiaab%2F.git

diff --git a/source/carddav/carddav-servercontact.cpp b/source/carddav/carddav-servercontact.cpp
index a5771c2..1ebc1df 100644
--- a/source/carddav/carddav-servercontact.cpp
+++ b/source/carddav/carddav-servercontact.cpp
@@ -48,10 +48,16 @@ void CardDAV::GetServerContactData()
 	wxString ServerAddressURL;
 	wxString ServerAuth;
 	wxString ServerAddressSSL;
-	wxString ServerAddressNormal;	
-
+	wxString ServerAddressNormal;
+	
         conn = curl_easy_init();
 	
+#if defined(__APPLE__)
+	
+	SetConnectionObject(conn);
+
+#endif
+	
 	struct CardDAVCURLPasser {
 	
 		CardDAV *Data;
@@ -95,6 +101,10 @@ void CardDAV::GetServerContactData()
 		curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
 		curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
 
+#if defined(__APPLE__)
+		
+#else
+		
 		ServerCertFilename = GetAccountDir(ServerAccount, TRUE);
 
 		if (wxFile::Exists(ServerCertFilename) == TRUE){
@@ -105,6 +115,8 @@ void CardDAV::GetServerContactData()
 		
 		}
 
+#endif
+		
 		claconncode = (curl_easy_perform(conn));
 
 		// If CURLE_PEER_FAILED_VERIFICATION is returned, retry without
@@ -145,6 +157,10 @@ void CardDAV::GetServerContactData()
 		// Check if it fails with a CURLE_SSL_CACERT then compare
 		// the certificates as PEM files.
 		
+#if defined(__APPLE__)
+		
+#else
+		
 		if (claconncode == CURLE_SSL_CACERT && wxFile::Exists(ServerCertFilename) == TRUE){
 		
 			CURL *sslerrconn;
@@ -238,6 +254,8 @@ void CardDAV::GetServerContactData()
 		
 		}
 		
+#endif
+		
 		// Sort out SSL error.
 		
 		// When SSL cert error occurs, connect again and fetch certificates.
@@ -271,7 +289,13 @@ void CardDAV::GetServerContactData()
 			curl_easy_setopt(sslerrconn, CURLOPT_NOSIGNAL, 1);
 			curl_easy_setopt(sslerrconn, CURLOPT_SSL_VERIFYPEER, 0);
 			curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
-					
+			
+#if defined(__APPLE__)
+			
+			SetConnectionObject(sslerrconn);
+			
+#endif
+			
 			sslerrconncode = (curl_easy_perform(sslerrconn));
 
 			SSLCertCol = BuildSSLCollection(sslerrconn);