X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.h;h=9947ea4834f5e20a5a4ac1def3593f3aa1e2fca5;hb=ee9b71949005734012f18251774807c38b989ae2;hp=d6dc31ae586da94978c229863a4bca5a22df8c91;hpb=25c2c8c7fed1898939175dfe2871015b6099c106;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index d6dc31a..9947ea4 100644
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -33,13 +33,14 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 #endif
 
 #include "../AppXestiaAddrBk.h"
-#include "../carddav/carddav.h"
 #include "../common/timers.h"
 #include "../common/etag.h"
 #include "../common/dirs.h"
 #include "../common/preferences.h"
 #include "../common/sslcertstructs.h"
-
+#include "../connobject/ConnectionObject.h"
+#include "../carddav2/carddav2.h"
+	
 #if defined(__WIN32__)
 #include "../common/win32ssl.h"
 #endif
@@ -107,7 +108,7 @@ class frmActivityMgr : public frmActivityMgrADT
 		std::map<int,wxString> ActivityListAccount;
 		std::map<int,wxString> ActivityListFilename;
 		std::map<int,wxString> ActivityListFullFilename;
-		std::map<int,CardDAV*> ActivityListConn;
+		std::map<int,ConnectionObject*> ActivityListConnObject;
 		std::map<int,ActivityMgrAccountSettings> ActivityListAccSettings;
 		std::map<int,wxString> ActivityListETag;
 		std::map<int,wxString> ActivityListETagOriginal;
@@ -142,6 +143,7 @@ class frmActivityMgr : public frmActivityMgrADT
 		void ToggleConnectionStatus( wxCommandEvent& event );
 		void SleepMode( wxCommandEvent &event );
 		void WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc);
+		void WriteServerCertificate(wxString AccountName, SSLCertCollectionString SSLCertInc);
 		void UpdateStatusLabel( wxCommandEvent& event );
 	public:
 		/** Constructor */