X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.cpp;h=6625432c12fb96fb3bbc3f06bb5236c833657d03;hp=ac703d82b6c39b93013e181aa4063184e3d58ab2;hb=57b0514feb18c2ed89f5c6f4b49d6c6513cac9f1;hpb=f555810b80ec5f3f9c2fb41a712ae00c5acd68ea

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index ac703d8..6625432 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -245,7 +245,7 @@ frmMainADT( parent )
     
 #elif defined(__WIN32__)
     
-	int stbBottomData [4] = { -1, 16, 16, 16 };
+	int stbBottomData [4] = { -1, 8, 8, 8 };
     
 #else
     
@@ -264,10 +264,8 @@ frmMainADT( parent )
 	stbBottom->GetFieldRect(3, rectActivity);
     
 	SSLToolTip = new wxToolTip(wxT(""));
-
-#if defined(__WIN32__)
-
-	imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint(rectOnline.GetX(),rectOnline.GetY()), wxDefaultSize, 0 );
+    
+	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 );
     
@@ -280,23 +278,6 @@ 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:
@@ -2595,7 +2576,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
 
 			// Setup and display the form.
 
-			if (SSLCertificateIter == AccountCertificateData.end() || SSLCertificateIter->second->pCertInfo == NULL){
+			if (SSLCertificateIter->second->pCertInfo == NULL){
 
 				wxMessageBox("No certificate information is available due to invalid connection details, connection being in progress or invalid certificate data received.");