Resolved merge conflict with actmgr/frmActivityMgr.h

diff --combined source/actmgr/frmActivityMgr.h
index 45f56fb,493bdd1..55458b1
--- 1/source/actmgr/frmActivityMgr.h
--- 2/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@@ -26,11 -26,6 +26,11 @@@ Subclass of frmActivityMgrADT, which i
  
  #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"
@@@ -60,15 -55,16 +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
  {
@@@ -90,6 -86,7 +100,7 @@@
                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;
@@@ -101,9 -98,6 +112,9 @@@
                //int ConflictResult = 0;
                wxETagProcessTimer *ETagTmrPtr;
                void *frmMainPtr;
 +#if defined(__APPLE__)
 +                int DisplayTrustPanel(SecTrustRef SecurityTrustObject, wxString AccountNameFriendly);
 +#endif
                //frmMain *frmMainPtr;
        protected:
                // Handlers for frmActivityMgrADT events.