From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 9 Apr 2016 07:53:16 +0000 (+0100)
Subject: Resolved merge conflict with actmgr/frmActivityMgr.h
X-Git-Tag: release-0.12~22
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=17ceb4e3a5a0b0fdb902775773699bfbbccc7b5c;hp=a066714be6d7646614c51e71313cc7c2a6bb4a0f;p=xestiaab%2F.git

Resolved merge conflict with actmgr/frmActivityMgr.h
---

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index 72135db..fe6eb3d 100644
--- a/source/actmgr/frmActivityMgr-tasks.cpp
+++ b/source/actmgr/frmActivityMgr-tasks.cpp
@@ -79,15 +79,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 	
 	}
 	
-	ActivityMgrAccountSettings AccountSettings;
-	AccountSettings.Address = AccountAddress;
-	AccountSettings.Port = AccountPort;
-	AccountSettings.Username = AccountUsername;
-	AccountSettings.Password = AccountPassword;
-	AccountSettings.SSL = AccountSSL;
-	AccountSettings.Prefix = AccountPrefix;
-	AccountSettings.Dir = AccountDir;
-	
 	CardDAVConn->SetupConnection(AccountAddress, AccountPort, AccountUsername, AccountPassword, AccountSSL, AccountPrefix, AccountDir);
 	CardDAVConn->SetupVariables(&ActivityList, ActivityTaskID);
 	CardDAVConn->SetupResultBools(&BlankBool, &BlankBool);		
@@ -121,7 +112,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
 		ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
-		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 		
 		ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
 		ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -149,7 +139,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
 		ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
-		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 		
 		ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
 		ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -172,7 +161,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
-		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 	
 	} else if (TaskType == 3){
 
@@ -189,7 +177,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, AccountPrefix));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
-		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 	
 	}
 	
diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 493bdd1..55458b1 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,15 @@ struct ActivityMgrLabelUpdate{
 	wxString ItemDes;
 };
 
+#if defined(__APPLE__)
+struct SSLInvalidTrustNotifObj{
+        SecTrustRef SecurityTrustObject;
+        int *ResultValue;
+        bool *PausePtr;
+        wxString AccountName;
+};
+#endif
+
 struct ActivityMgrAccountSettings{
 	wxString Address;
 	int Port;
@@ -98,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.