Merge commits from upstream

[xestiaab/.git] / source / actmgr / frmActivityMgr.cpp

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index 546795a..63755f8 100644 (file)
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -218,7 +218,6 @@ void frmActivityMgr::ProcessTasksThread()
        std::map<int,long>::iterator LongIter;
        bool TasksFoundProc = FALSE;
        wxString TaskDetail;
-       XABPreferences PrefData(GetUserPrefDir());
        
        for (std::map<int,int>::iterator iter = ActivityList.begin(); 
         iter != ActivityList.end(); ++iter){
@@ -269,6 +268,7 @@ void frmActivityMgr::ProcessTasksThread()
                // 8 = Completed. (UI Updated). 
                
                frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
+               XABPreferences PrefData(GetUserPrefDir());
                
                if (iter->second == 0){
                
@@ -1221,6 +1221,13 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&SSLICNProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                        
+                                                               /*timespec n1, n2;
+                                               
+                                                               // Fall asleep until we get an response.
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                       
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
@@ -1459,6 +1466,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                                
+                                                               /*timespec n1, n2;
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                               
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
@@ -1723,6 +1735,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                                
+                                                               /*timespec n1, n2;
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                               
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
@@ -1855,6 +1872,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                        
+                                                               /*timespec n1, n2;
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                       
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
@@ -2019,11 +2041,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                KeepUpdating = FALSE;
                                        
                                        }
-
+                                       
                                }
-
+                               
                                // Mark as completed.
-
+                       
                                wxString AccountNameFinal;
                                AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID);
                                AccountNameFinal.Append(wxT(".carddav"));
@@ -2031,7 +2053,7 @@ void frmActivityMgr::ProcessTasksThread()
                                wxCommandEvent reloadevent(RELOADCONTACTLIST);
                                reloadevent.SetString(AccountNameFinal);
                                wxPostEvent(this->GetParent(), reloadevent);
-
+                               
                                iter->second = 4;
                                continue;