Fixed cleaning of old object files

[xestiaab/.git] / source / carddav / carddav-processdata.cpp

diff --git a/source/carddav/carddav-processdata.cpp b/source/carddav/carddav-processdata.cpp
index 99337bc..1e5a603 100644 (file)
--- a/source/carddav/carddav-processdata.cpp
+++ b/source/carddav/carddav-processdata.cpp
@@ -44,10 +44,16 @@ void CardDAV::ProcessDataThread(){
        wxString ServerAddressURL;
        wxString ServerAuth;
        wxString ServerAddressSSL;
-       wxString ServerAddressNormal;   
-
+       wxString ServerAddressNormal;
+        
         conn = curl_easy_init();
        
+#if defined(__APPLE__)
+       
+        SetConnectionObject(conn);
+
+#endif
+       
        struct CardDAVCURLPasser {
        
                CardDAV *Data;
@@ -68,7 +74,7 @@ void CardDAV::ProcessDataThread(){
        wxString ETagOriginal;
        wxString ETagServer;
                
-       ServerAddressURL = ServerAddress + wxT(":") + wxString::Format(wxT("%i"), ServerPort) + wxT("/") + ServerPrefix + ServerFilenameLocation;
+       ServerAddressURL = ServerAddress + wxT(":") + wxString::Format(wxT("%i"), ServerPort) + ServerPrefix + ServerFilenameLocation;
        ServerAddressSSL = wxT("https://") + ServerAddressURL;
        ServerAddressNormal = wxT("http://") + ServerAddressURL;
        
@@ -123,6 +129,10 @@ void CardDAV::ProcessDataThread(){
                
                }
 
+#if defined(__APPLE__) || defined(__WIN32__)
+               
+#else
+               
                ServerCertFilename = GetAccountDir(ServerAccount, TRUE);
 
                if (wxFile::Exists(ServerCertFilename) == TRUE){
@@ -132,6 +142,8 @@ void CardDAV::ProcessDataThread(){
                        curl_easy_setopt(conn, CURLOPT_CAINFO, (const char*)ServerCertFilename.mb_str(wxConvUTF8));
                
                }
+       
+#endif
                
                claconncode = (curl_easy_perform(conn));
 
@@ -185,6 +197,10 @@ void CardDAV::ProcessDataThread(){
                // 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;
@@ -210,9 +226,9 @@ void CardDAV::ProcessDataThread(){
                
                        wxString SSLLocalData;
                        wxString SSLServerData;
-               
-                       sslerrconncode = (curl_easy_perform(sslerrconn));
-               
+                        
+                        sslerrconncode = (curl_easy_perform(sslerrconn));
+                       
                        SSLCertCol = BuildSSLCollection(sslerrconn);
                        std::map<int, SSLCertData>::iterator SSLCDIter = SSLCertCol.SSLCollection.find(0);
                        std::multimap<wxString,wxString>::iterator SSLDataIter = SSLCDIter->second.CertData.find(wxT("Cert"));
@@ -293,6 +309,8 @@ void CardDAV::ProcessDataThread(){
                        curl_easy_cleanup(sslerrconn);
                
                }
+               
+#endif
 
                // Sort out SSL error.
                
@@ -327,17 +345,29 @@ void CardDAV::ProcessDataThread(){
                        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));
 
+#if defined(__APPLE__)
+                       
+#else
+                       
                        SSLCertCol = BuildSSLCollection(sslerrconn);
                        SSLCertCol.SuccessCode = 1;
 
+#endif
+                       
                        return;
                
                } else if (claconncode == CURLE_HTTP_RETURNED_ERROR){
                
-                       fprintf(stderr, "curl_easy_perform() failed: %s\n",
+                       fprintf(stderr, "ProcessDataThrad(): curl_easy_perform() failed: %s\n",
                                        curl_easy_strerror(claconncode));
                        int http_code = 0;
                        curl_easy_getinfo(conn, CURLINFO_RESPONSE_CODE, &http_code);