X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr-tasks.cpp;h=842598d4327530eb7b7ea8f1e8961bc7cd8ba38e;hb=2c8998278759b5bf6fc3bcf75afd289c214b6c84;hp=513b8fe0d2600613d8b5ce90ab803ac8b2846b71;hpb=d269801e3d32dbbea14af5f261190ef097635fce;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index 513b8fe..842598d 100644
--- a/source/actmgr/frmActivityMgr-tasks.cpp
+++ b/source/actmgr/frmActivityMgr-tasks.cpp
@@ -26,7 +26,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 
 	wxListItem coldata;
 	long itemindex = -1;
-	CardDAV* CardDAVConn = new CardDAV;
 
 	coldata.SetId(ActivityTaskID);
 	coldata.SetData(ActivityTaskID);
@@ -90,11 +89,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 	AccountSettings.Password = AccountPassword;
 	AccountSettings.SSL = AccountSSL;
 	AccountSettings.Prefix = AccountPrefix;
-	AccountSettings.Dir = AccountDir;
-	
-	CardDAVConn->SetupConnection(AccountAddress, AccountPort, AccountUsername, AccountPassword, AccountSSL, AccountPrefix, AccountDir);
-	CardDAVConn->SetupVariables(&ActivityList, ActivityTaskID);
-	CardDAVConn->SetupResultBools(&BlankBool, &BlankBool);		
+	AccountSettings.Dir = AccountDir;	
 
 	// TaskType:
 	// 0 - Add a contact.
@@ -110,9 +105,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		lstActivity->SetItem(itemindex, 1, AccountName);
 		lstActivity->SetItem(itemindex, 2, _("Queued"));
 		
-		CardDAVConn->SetUploadMode(TRUE);
-		CardDAVConn->SetupData(wxT("PUT"), TaskURL, TaskData);
-		
 		// Setup all of the task details.
 
 		ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
@@ -124,7 +116,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
 		ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
 		ActivityListEditMode.insert(std::make_pair(ActivityTaskID, false));
-		ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
 		ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
 		ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
@@ -176,11 +167,16 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		
 		ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
 		
+		CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+		ConnObject->SetupConnectionObject();
+		
 		ActivityList.insert(std::make_pair(ActivityTaskID, 0));
 		ActivityListType.insert(std::make_pair(ActivityTaskID, 2));
 		ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
+		ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
+		ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
 		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 	
@@ -192,12 +188,15 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		lstActivity->SetItem(itemindex, 1, AccountName);
 		lstActivity->SetItem(itemindex, 2, _("Queued"));
 		
+		CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+		ConnObject->SetupConnectionObject();
+		
 		ActivityList.insert(std::make_pair(ActivityTaskID, 0));
 		ActivityListType.insert(std::make_pair(ActivityTaskID, 3));
 		ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
-		ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
 		ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, AccountPrefix));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
+		ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
 		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 	
@@ -247,12 +246,6 @@ void frmActivityMgr::StopTask( wxCommandEvent& event ){
 		return;
 	}
 	
-	std::map<int,CardDAV*>::iterator CDAVter;
-	
-	CDAVter = ActivityListConn.find(intSelectedData);
-	
-	CDAVter->second->Abort();
-	
 	lstActivity->SetItem(longSelected, 2, _("Stopped"));
 
 }
@@ -276,12 +269,6 @@ void frmActivityMgr::StopAllTasks( wxCommandEvent& event ){
 		return;
 	}
 	
-	std::map<int,CardDAV*>::iterator CDAVter;
-	
-	CDAVter = ActivityListConn.find(intSelectedData);
-	
-	CDAVter->second->Abort();
-	
 	lstActivity->SetItem(longSelected, 2, _("Stopped"));
 	AnimationTimer.StopAnimation();
 	bmpActivity->SetBitmap(SleepBitmap);
@@ -306,10 +293,6 @@ void frmActivityMgr::RetryTask( wxCommandEvent& event ){
 		return;
 	}
 	
-	std::map<int,CardDAV*>::iterator CDAVter;
-	
-	CDAVter = ActivityListConn.find(intSelectedData);
-	
 	// Restart the task.
 	
 	//CDAVter->second.Abort();