X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.h;h=55458b1884d746c1d915e47e649e15be8cd4dee7;hb=5528afda21efc9c9e3c9baea4ebe4f1fc8819adb;hp=f11bf79b5197dac353fa6ae1a19bdf3a401c925c;hpb=c5497d20f788e33420ad719bdee7f9f558478b08;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index f11bf79..55458b1 100644
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -24,13 +24,20 @@
 Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 */
 
-#include "AppXestiaAddrBk.h"
-#include "carddav/carddav.h"
 #include <map>
 #include <wx/timer.h>
+#if defined(__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#include "../frmMain.h"
+#endif
 
-#include "common/timers.h"
-#include "common/etag.h"
+#include "../AppXestiaAddrBk.h"
+#include "../carddav/carddav.h"
+#include "../common/timers.h"
+#include "../common/etag.h"
+#include "../common/dirs.h"
+#include "../common/preferences.h"
 
 //// end generated include
 
@@ -53,6 +60,25 @@ struct ActivityMgrLabelUpdate{
 	wxString ItemDes;
 };
 
+#if defined(__APPLE__)
+struct SSLInvalidTrustNotifObj{
+        SecTrustRef SecurityTrustObject;
+        int *ResultValue;
+        bool *PausePtr;
+        wxString AccountName;
+};
+#endif
+
+struct ActivityMgrAccountSettings{
+	wxString Address;
+	int Port;
+	wxString Username;
+	wxString Password;
+	bool SSL;
+	wxString Prefix;
+	wxString Dir;
+};
+
 /** Implementing frmActivityMgrADT */
 class frmActivityMgr : public frmActivityMgrADT
 {
@@ -74,6 +100,7 @@ class frmActivityMgr : public frmActivityMgrADT
 		std::map<int,wxString> ActivityListFilename;
 		std::map<int,wxString> ActivityListFullFilename;
 		std::map<int,CardDAV*> ActivityListConn;
+		std::map<int,ActivityMgrAccountSettings> ActivityListAccSettings;
 		std::map<int,wxString> ActivityListETag;
 		std::map<int,wxString> ActivityListETagOriginal;
 		std::map<int,wxDateTime> ActivityListFinDate;
@@ -85,6 +112,9 @@ class frmActivityMgr : public frmActivityMgrADT
 		//int ConflictResult = 0;
 		wxETagProcessTimer *ETagTmrPtr;
 		void *frmMainPtr;
+#if defined(__APPLE__)
+                int DisplayTrustPanel(SecTrustRef SecurityTrustObject, wxString AccountNameFriendly);
+#endif
 		//frmMain *frmMainPtr;
 	protected:
 		// Handlers for frmActivityMgrADT events.