Resolved merge conflict with actmgr/frmActivityMgr.h

[xestiaab/.git] / source / actmgr / frmActivityMgr.h

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 493bdd1..55458b1 100644 (file)
--- 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.