X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.cpp;h=be5f40aa2eddd38fe7152c8d3c2100694364ddac;hp=af6b8325e3e53f43650e3497c0051bc64ea4fb64;hb=ccc379ac30775d5b73698b83875a35fc1bfa56d0;hpb=5b9dfdbcb6c0ab7be6988b58da32e60d7cee3ec0

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index af6b832..be5f40a 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -496,7 +496,7 @@ void frmActivityMgr::ProcessTasksThread()
 #endif
 					
 					COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(StringURLIter->second.ToStdString(), 
-							StringDataIter->second.ToStdString());
+							std::string(StringDataIter->second.ToUTF8()));
 					
 					if (AddContactResponse.RequestResult != COREQUEST_OK){
 						iter->second = 2;
@@ -512,8 +512,6 @@ void frmActivityMgr::ProcessTasksThread()
 						break;
 					}
 					
-					std::cout << ETagGetResponse.EntityTag << std::endl;
-					
 					ETagDBPtr->UpdateETag(ContactFilename, ETagGetResponse.EntityTag, ETagGetResponse.EntityTag);
 					
 					iter->second = 4;
@@ -823,7 +821,7 @@ void frmActivityMgr::ProcessTasksThread()
 						// Upload the data to the server.
 						
 						COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(StringURLIter->second.ToStdString(), 
-							StringDataIter->second.ToStdString());
+							std::string(StringDataIter->second.ToUTF8()));
 					
 						if (EditContactResponse.RequestResult != COREQUEST_OK){
 							iter->second = 2;
@@ -1708,8 +1706,6 @@ void frmActivityMgr::ProcessTasksThread()
 								break;
 							}
 							
-							// TODO: Continue from here!
-							
 							ETagServer = wxString::FromUTF8(ServerEntityTag.EntityTag.c_str());
 				
 							if (ETagOriginal != ETagServer){
@@ -1785,7 +1781,7 @@ void frmActivityMgr::ProcessTasksThread()
 					
 									// Decided to use client version.
 					
-									COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), ClientData.WriteString().ToStdString());
+									COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), std::string(ClientData.WriteString().ToUTF8()));
 						
 									if (EditContactResponse.RequestResult != COREQUEST_OK){
 										iter->second = 2;
@@ -1834,7 +1830,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 								// Upload the data to the server.
 								
-								COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), TaskData.ToStdString());
+								COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), std::string(TaskData.ToUTF8()));
 							
 								if (AddContactResponse.RequestResult != COREQUEST_OK){
 									iter->second = 2;
@@ -1927,7 +1923,7 @@ void frmActivityMgr::ProcessTasksThread()
 					
 									// Decided to use client version.
 								
-									COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), ClientData.WriteString().ToStdString());
+									COServerResponse EditContactResponse = ConnObjectIter->second->EditContact(vCardAdd[vi].ToStdString(), std::string(ClientData.WriteString().ToUTF8()));
 
 									if (EditContactResponse.RequestResult != COREQUEST_OK){
 										iter->second = 2;
@@ -1976,7 +1972,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 								// Upload the data to the server.
 								
-								COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), TaskData.ToStdString());
+								COServerResponse AddContactResponse = ConnObjectIter->second->AddContact(vCardAdd[vi].ToStdString(), std::string(TaskData.ToUTF8()));
 
 								if (AddContactResponse.RequestResult != COREQUEST_OK){
 									iter->second = 2;