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

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 1237b82..a41a629 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -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();