Moved includes in frmEditAccount.cpp to frmEditAccount.h

[xestiaab/.git] / source / frmEditAccount.cpp

diff --git a/source/frmEditAccount.cpp b/source/frmEditAccount.cpp
index 4883625..e9e9def 100644 (file)
--- a/source/frmEditAccount.cpp
+++ b/source/frmEditAccount.cpp
@@ -17,9 +17,6 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include "frmEditAccount.h"
-#include "frmInvalidSSLCertificate.h"
-#include "carddav/carddav.h"
-#include "common/svrblist.h"
 
 frmEditAccount::frmEditAccount( wxWindow* parent )
 :
@@ -105,6 +102,12 @@ void frmEditAccount::DetectAddressBook( wxCommandEvent& event )
 
                        int SSLResult;
                        
+#if defined(__APPLE__)
+       
+                       SSLResult = DisplayTrustPanel(&CDavObj);
+                       
+#else
+                       
                        frmInvalidSSLCertificate *frmICPtr = new frmInvalidSSLCertificate(this);
 
                        frmICPtr->LoadDataNew(CDavObj.GetSSLVerifyResults(), txtAddress->GetValue());
@@ -116,7 +119,9 @@ void frmEditAccount::DetectAddressBook( wxCommandEvent& event )
                                
                        delete frmICPtr;
                        frmICPtr = NULL;
-                                               
+                       
+#endif
+                       
                        // Process the response from the user.
                                                        
                        if (SSLResult == 1){
@@ -133,7 +138,6 @@ void frmEditAccount::DetectAddressBook( wxCommandEvent& event )
                                return;
                                                                
                        }
-                               
 
                } else {
 
@@ -173,9 +177,9 @@ void frmEditAccount::LoadSettings( wxString AccNameIn ){
        bool ContinueAcc = TRUE;
        wxString AccountName;
        wxString AccountData;
-
+       
        ContinueAcc = cfgfile->GetFirstGroup(AccountName, itemindex);
-
+       
        while (ContinueAcc){
 
                if (AccountName == AccName){