Moved the ConnectionObject subroutines in the CardDAV header to in the #defined(__APP...

[xestiaab/.git] / source / carddav / carddav.h

diff --git a/source/carddav/carddav.h b/source/carddav/carddav.h
index dbbcc9b..6afc3f8 100644 (file)
--- a/source/carddav/carddav.h
+++ b/source/carddav/carddav.h
@@ -1,3 +1,24 @@
+// carddav.h - CardDAV Object header file.
+//
+// (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/>
+
+#ifndef CALDAV_CALDAV_H
+#define CALDAV_CALDAV_H
+
 #include <iostream>
 #include <map>
 #include <wx/wx.h>
@@ -5,12 +26,9 @@
 #include <libxml/tree.h>
 #include <curl/curl.h>
 #include "../vcard/vcard.h"
-#include "../frmActivityMgr.h"
+#include "../actmgr/frmActivityMgr.h"
 #include "../common/sslcertstructs.h"
 
-#ifndef CALDAV_CALDAV_H
-#define CALDAV_CALDAV_H
-
 struct FileSyncData{
        unsigned int DataFlag:2;
        wxString ETagData;
@@ -85,10 +103,16 @@ class CardDAV
                wxString GetDefaultAddressBookURL();
                void GetSSLResults();
                SSLCertCollection GetCertificateData();
-               static SSLCertCollection BuildSSLCollection(CURL *conn);
+                static SSLCertCollection BuildSSLCollection(CURL *conn);
                wxString ETagValueResult();
                wxString GetErrorMessage();
-       
+               static size_t WritebackFunc(char *ptr, size_t size, size_t nmemb, wxString *stream);
+#if defined(__APPLE__)
+               static CURL* GetConnectionObject();
+               static void SetConnectionObject(CURL *ConnectionObject);
+               SecTrustRef GetTrustObject();
+#endif
+    
                // SSL Verification tests when connecting.
 
                static CURLcode SSLVerifyTest();
@@ -96,6 +120,11 @@ class CardDAV
 
                //size_t WritebackFunc(char *ptr, size_t size, size_t nmemb, FILE *userdata);
        private:
+#if defined(__APPLE__)
+               static SSLContext *SSLContextPointer;
+               static SecTrustRef SecTrustObject;
+               static CURL* ConnectionObject;
+#endif
                static wxString ServerAddress;
                static int ServerPort;
                static wxString ServerUser;