X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fforms%2Fnewaccount%2FfrmNewAccount.cpp;h=c50cf8422b5be7cdac633814acced16a111c34e2;hb=512577f3a85cf85feab3f09e9389581bb379413a;hp=57b14f9517b2e64072fdad45aca2ef64fc77a17b;hpb=bfa613e1025ab5a057a8312d49079beab700abfa;p=xestiacalendar%2F.git

diff --git a/source/forms/newaccount/frmNewAccount.cpp b/source/forms/newaccount/frmNewAccount.cpp
index 57b14f9..c50cf84 100644
--- a/source/forms/newaccount/frmNewAccount.cpp
+++ b/source/forms/newaccount/frmNewAccount.cpp
@@ -504,14 +504,14 @@ void frmNewAccount::RunCalDAVTest( wxCommandEvent &event )
 	
 	if (testConnection.SSLVerify() == COSSL_UNABLETOVERIFY){
 #if defined(__APPLE__)
-		
+        
 		testConnection.BypassSSLVerification(true);
 		
-		CalDAVServerResult testConnection = testConnection.Connect(false);
+		CalDAVServerResult testConnectionResult = testConnection.Connect(false);
 		
 		testConnection.BypassSSLVerification(false);
 		
-		int SSLResult = DisplayTrustPanel(&TestConnection);
+		int SSLResult = DisplayTrustPanel(&testConnection);
 		
 		if (SSLResult != NSOKButton){
 			
@@ -519,7 +519,7 @@ void frmNewAccount::RunCalDAVTest( wxCommandEvent &event )
 			lblServerResponse->SetLabel(_("Not applicable"));
 			lblServerSSLResult->SetLabel(_("Used"));
 			lblServerSSLValid->SetLabel(_("No"));
-			lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + TestConnection.GetErrorMessage());
+			lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + testConnection.GetErrorMessage());
 			btnPrevious->Enable(true);
 			return;
 			
@@ -532,7 +532,8 @@ void frmNewAccount::RunCalDAVTest( wxCommandEvent &event )
 			switch(evalResult){
 				case kSecTrustResultProceed:
 					lblServerSSLValid->SetLabel(_("Verified"));
-					break;
+                    break;
+                case kSecTrustResultUnspecified:
 				case kSecTrustResultConfirm:
 					lblServerSSLValid->SetLabel(_("Verified (user)"));
 					break;
@@ -540,10 +541,14 @@ void frmNewAccount::RunCalDAVTest( wxCommandEvent &event )
 					lblServerSSLValid->SetLabel(_("Unable to verify"));
 			}
 			
+            lblServerConnResult->SetLabel(_("Connected"));
 			lblServerResponse->SetLabel(_("Not applicable"));
 			lblServerSSLResult->SetLabel(_("Used"));
 			
-			if (evalResult != kSecTrustResultProceed){
+            btnPrevious->Enable(true);
+            
+			if (evalResult != kSecTrustResultProceed && evalResult != kSecTrustResultUnspecified){
+                lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + testConnection.GetErrorMessage());
 				return;
 			}
 			
@@ -678,4 +683,4 @@ void frmNewAccount::RunCalDAVTest( wxCommandEvent &event )
 	wxCommandEvent resultsEvent(UPDATERESULTS);
 	resultsEvent.SetClientData(resultData);
 	wxPostEvent(this, resultsEvent);
-}
\ No newline at end of file
+}