#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
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;
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 */