X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.h;h=cae74e7d4d740e06911721ebbb51f75df8a727ed;hb=3159f45b9111138301b288e6de30e158933cec88;hp=71b8515d09bfd7a9d4f02206c3d9cfd6072b9592;hpb=b4270b72247cfdfcffe23725c0811c7b011a5a77;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 71b8515..cae74e7 100644
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -26,6 +26,11 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 
 #include <map>
 #include <wx/timer.h>
+#if defined(__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#include "../frmMain.h"
+#endif
 
 #include "../AppXestiaAddrBk.h"
 #include "../carddav/carddav.h"
@@ -55,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
 {
@@ -71,11 +95,14 @@ class frmActivityMgr : public frmActivityMgrADT
 		std::map<int,int> ActivityListType;
 		std::map<int,long> ActivityListIndex;
 		std::map<int,wxString> ActivityListData;
+		std::map<int,wxString> ActivityListURL;
+		std::map<int,bool> ActivityListEditMode;
 		std::map<int,wxString> ActivityListTaskDetail;
 		std::map<int,wxString> ActivityListAccount;
 		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;
@@ -87,6 +114,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.