X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=ac703d82b6c39b93013e181aa4063184e3d58ab2;hb=e6968c57878efdbc17f99b090a427308b67eeb24;hp=bae3e30a400e74d45de5e3989ac9fa27f033a3c3;hpb=092b6356d5a3abbc9edb00792f95cecb95b17d06;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index bae3e30..ac703d8 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -264,8 +264,10 @@ frmMainADT( parent )
 	stbBottom->GetFieldRect(3, rectActivity);
     
 	SSLToolTip = new wxToolTip(wxT(""));
-    
-	imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()),(rectOnline.GetY())), wxDefaultSize, 0 );
+
+#if defined(__WIN32__)
+
+	imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint(rectOnline.GetX(),rectOnline.GetY()), wxDefaultSize, 0 );
 	imgConnStatus->SetBitmap(*imgOnline);
 	imgConnStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ToggleConnectionStatus ), NULL, this );
     
@@ -278,6 +280,23 @@ frmMainADT( parent )
 	imgActivityStatus->SetBitmap(*imgActIconSleep);
 	imgActivityStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ShowActivityWindow ), NULL, this );
     
+#else
+
+	imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()), (rectOnline.GetY())), wxDefaultSize, 0);
+	imgConnStatus->SetBitmap(*imgOnline);
+	imgConnStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ToggleConnectionStatus), NULL, this);
+
+	imgSSLStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectSSL.GetX()), (rectSSL.GetY())), wxDefaultSize, 0);
+	imgSSLStatus->SetBitmap(*imgNoSSL);
+	imgSSLStatus->SetToolTip(SSLToolTip);
+	imgSSLStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowSSLCertificates), NULL, this);
+
+	imgActivityStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectActivity.GetX()), (rectActivity.GetY())), wxDefaultSize, 0);
+	imgActivityStatus->SetBitmap(*imgActIconSleep);
+	imgActivityStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowActivityWindow), NULL, this);
+
+#endif
+
 	// Setup the window menu.
     
 	// By default should be:
@@ -2576,7 +2595,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
 
 			// Setup and display the form.
 
-			if (SSLCertificateIter->second->pCertInfo == NULL){
+			if (SSLCertificateIter == AccountCertificateData.end() || SSLCertificateIter->second->pCertInfo == NULL){
 
 				wxMessageBox("No certificate information is available due to invalid connection details, connection being in progress or invalid certificate data received.");