X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.cpp;h=e9ce30477bc121d14b98ef591b3f4684a882de40;hp=aeffdbaa0f2843b96464cea0d59fb7442022da7d;hb=974a0d586c5480559439d4756c3ce5fb3876da0c;hpb=540e667a9fdae2213756c164185e4d7f78f33e2b

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index aeffdba..e9ce304 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -65,7 +65,6 @@
 // Define the event types.
 
 DEFINE_EVENT_TYPE(CE_UPDATECONTACTLIST);
-DEFINE_EVENT_TYPE(CE_UPDATEACCOUNTLIST);
 DEFINE_EVENT_TYPE(SE_UPDATECONTACTNOTIF);
 DEFINE_EVENT_TYPE(CE_OPENCONTACT);
 DEFINE_EVENT_TYPE(CE_OPENCONTACTLIST);
@@ -99,7 +98,6 @@ DEFINE_EVENT_TYPE(INVALIDSSLTRUST);
 BEGIN_EVENT_TABLE(frmMain, wxFrame)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, frmMain::ConflictResolution)
 EVT_COMMAND(wxID_ANY, CE_UPDATECONTACTLIST, frmMain::UpdateContactList)
-EVT_COMMAND(wxID_ANY, CE_UPDATEACCOUNTLIST, frmMain::UpdateAccountList)
 EVT_COMMAND(wxID_ANY, SE_UPDATECONTACTNOTIF, frmMain::UpdateSearchContactLists)
 EVT_COMMAND(wxID_ANY, CE_OPENCONTACT, frmMain::OpenContactInfo)
 EVT_COMMAND(wxID_ANY, CE_OPENCONTACTLIST, frmMain::OpenContactInfoList)
@@ -1456,7 +1454,11 @@ void frmMain::LoadPreferences(){
 		
 		ContactBackgroundColour = preferences.GetBackgroundContactColourData();
 		
-	}
+        } else {
+                
+                ContactBackgroundColour = wxTransparentColour;
+                
+        }
 	
 	treAccounts->DeleteAllItems();
     
@@ -1785,12 +1787,6 @@ void frmMain::UpdateContactList(wxCommandEvent& event){
     
 }
 
-void frmMain::UpdateAccountList(wxCommandEvent& event){
-    
-	// Update the account list (currently unimplemented).
-    
-}
-
 void frmMain::SetupPointers(void *ActMgrPtrInc){
     
 	// Setup the pointers for the main window.
@@ -3179,7 +3175,10 @@ void frmMain::ShowContactMenu( wxMouseEvent& event ){
 
 	bool EnableRefresh = FALSE;
 
-	if (!ActiveAccount.IsEmpty() && (ActiveAccountType == "CardDAV" || ActiveAccountType == "carddav")){
+	if (!ActiveAccount.IsEmpty() && (ActiveAccountType == "CardDAV" ||
+                ActiveAccountType == "carddav" ||
+                ActiveAccountType == "Local" ||
+                ActiveAccountType == "local")){
 
 		EnableRefresh = TRUE;
 	
@@ -3224,4 +3223,4 @@ bool frmMain::CloseAllWindows()
 	{
 		return false;
 	}
-}
\ No newline at end of file
+}