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 f258d69..6ed3aa5 100644 (file)
--- a/source/carddav/carddav-defaultadrurl.cpp
+++ b/source/carddav/carddav-defaultadrurl.cpp
@@ -1,3 +1,21 @@
+// carddav-defaultadrurl.cpp - CardDAV Object - Default Address URL subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "carddav.h"
 #include "../version.h"
 #include <wx/wx.h>
@@ -12,7 +30,7 @@
 
 wxString CardDAV::GetDefaultAddressBookURL(){
 
-       // First: Get the principal UID address.
+       // Get the default address book URL.
        
        PageData.Clear();
        PageHeader.Clear();
@@ -28,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;
@@ -146,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){
@@ -333,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){
@@ -509,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){