Altered CardDAV object to accommodate for SSL support for OS X (and other OSes in...

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

diff --git a/source/carddav/carddav-defaultadrurl.cpp b/source/carddav/carddav-defaultadrurl.cpp
index dffe246..6ed3aa5 100644 (file)
--- a/source/carddav/carddav-defaultadrurl.cpp
+++ b/source/carddav/carddav-defaultadrurl.cpp
@@ -30,7 +30,7 @@
 
 wxString CardDAV::GetDefaultAddressBookURL(){
 
-       // First: Get the principal UID address.
+       // Get the default address book URL.
        
        PageData.Clear();
        PageHeader.Clear();
@@ -46,7 +46,11 @@ wxString CardDAV::GetDefaultAddressBookURL(){
        wxString ServerAddressSSL;
        wxString ServerAddressNormal;   
 
+       // First: Get the principal UID address.
+       
        conn = curl_easy_init();
+        
+        SetConnectionObject(conn);
        
        struct curl_slist *connhd = NULL;
        struct curl_slist *connhd2 = NULL;
@@ -164,6 +168,8 @@ wxString CardDAV::GetDefaultAddressBookURL(){
                        curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
                }
 
+                SetConnectionObject(conn);
+        
                conncode = (curl_easy_perform(conn));
 
                if (conncode == CURLE_OK){
@@ -351,6 +357,8 @@ wxString CardDAV::GetDefaultAddressBookURL(){
                        curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
                }
 
+                SetConnectionObject(conn);
+                
                conncode = (curl_easy_perform(conn));
 
                if (conncode == CURLE_OK){
@@ -527,6 +535,8 @@ wxString CardDAV::GetDefaultAddressBookURL(){
                        curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
                }
 
+                SetConnectionObject(conn);
+                
                conncode = (curl_easy_perform(conn));
 
                if (conncode == CURLE_OK){