X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=a41a6295a2b8691efdfe9338864d8276ad6d2a39;hb=7bab37a4219b657a5adc432e039075fc61345c61;hp=0500383aa2d87f15243e2fce448ca566185f740d;hpb=a4deb4d72448721584279013bedb6f9c8ceb23ac;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 0500383..a41a629 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -43,7 +43,7 @@
 #include "frmContact.h"
 #include "frmConflictResolution.h"
 #include "frmInvalidSSLCertificate.h"
-#include "frmSearch.h"
+#include "search/frmSearch.h"
 #include "frmSSLCertificate.h"
 #include "frmUpdate.h"
 #include "import/frmImportResults.h"
@@ -1429,12 +1429,6 @@ void frmMain::LoadPreferences(){
     
     AccountSyncTimers.clear();
     
-    /*
-     for (int i = (preferences.accounts.GetCount() - 1); i > 0; --i){
-     treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i));
-     }
-     */
-    
     wxString AccDir;
     wxString AccDirFull;
     wxString AccDirFullSfx;
@@ -1478,7 +1472,7 @@ void frmMain::LoadPreferences(){
         if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
             preferences.accounts.GetAccountType(i) == wxT("carddav")){
             
-            // Check if the directory exists before doing anything.
+            // TODO: Check if the directory exists before doing anything.
             
             
             
@@ -1514,8 +1508,7 @@ void frmMain::LoadPreferences(){
         wxString vCardFilename;
         wxString vCardDataString;
         wxString vCardFilenameFull;
-        //bool ProcFiles = FALSE;
-        
+
         bool ProcFiles = vcardaccdir.GetFirst(&vCardFilename, wxEmptyString, wxDIR_FILES);
         while(ProcFiles){
             
@@ -1586,11 +1579,7 @@ void frmMain::ConflictResolution(wxCommandEvent& event){
     vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
     vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
     vCard *ServerDataPtr = vCardConfObj->vCardServerData;
-    //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
-    //wxString Moo = ClientDataPtr->WriteString();
-    //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
     frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
-    //frameCR->LoadData(vCardConfObj->vCardLocalData, vCardConfObj->vCardServerData, &MemoryFileList);
     frameCR->ShowModal();
     
     int FinalConflictResult = frameCR->GetResult();
@@ -1842,7 +1831,6 @@ void frmMain::OpenFindContactsWindow(wxCommandEvent& event){
 
 void frmMain::RemoveContactsWindowPointer(wxCommandEvent& event){
     
-    //frmSearch *frameSCH = static_cast<frmSearch*>(ActMgrPtr);
     void *frameSCH = (void*)event.GetClientData();
     
     SearchWindowList.erase(frameSCH);
@@ -1861,20 +1849,6 @@ void frmMain::RemoveContactEditorWindowPointer(wxCommandEvent& event){
     
 }
 
-void frmMain::UpdateWindowList(wxCommandEvent& event){
-    
-    // Update the Window List.
-    
-    // Delete the existing items in the window menu.
-    
-    // Get the list of contacts.
-    
-    // Insert a separator.
-    
-    // Get the list of search windows.
-    
-}
-
 void frmMain::RevealContact(wxCommandEvent& event){
     
     UCNotif *uc = (UCNotif*)event.GetClientData();
@@ -2387,15 +2361,7 @@ void frmMain::WindowEdit( wxCommandEvent &event ){
         std::map<int, wxMenuItem*>::iterator MenuIter = WindowListPointersMenu.find(WData->WindowID);
         
         MenuIter->second->SetItemLabel(WindowTitle);
-        
-        //mnuWindow->FindChildItem(intID, &pos);
-        //wxMenuItem *mnuNewItem = new wxMenuItem(NULL, WData->WindowID, WindowTitle, WData->WindowID), wxEmptyString, wxITEM_NORMAL, NULL);
-        //mnuNewItem->SetId(WData->WindowID);
-        //ContactWindowListPointersMenu.insert(std::make_pair(WData->WindowID, mnuNewItem));
-        //ContactWindowListPointers.insert(std::make_pair(WData->WindowID, WData->WindowPointer));
-        //mnuWindow->Insert((pos + 1), mnuNewItem);
-        //this->Connect(mnuNewItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(frmMain::ShowContactWindow));
-        
+                
     } else if (WData->DataType == 1){
         
         // Get the window title and use that.
@@ -2416,14 +2382,6 @@ void frmMain::WindowEdit( wxCommandEvent &event ){
             
         }
         
-        //mnuWindow->FindChildItem(intID, &pos);
-        //wxMenuItem *mnuNewItem = new wxMenuItem(NULL, WData->WindowID, WindowTitle, WData->WindowID), wxEmptyString, wxITEM_NORMAL, NULL);
-        //mnuNewItem->SetId(WData->WindowID);
-        //ContactEditorWindowListPointersMenu.insert(std::make_pair(WData->WindowID, mnuNewItem));
-        //ContactEditorWindowListPointers.insert(std::make_pair(WData->WindowID, WData->WindowPointer));
-        //mnuWindow->Insert((pos + 1), mnuNewItem);
-        //this->Connect(mnuNewItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(frmMain::ShowContactEditorWindow));
-        
     }
     
     delete WData;