Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed utf8/wstring calls

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-10-04 18:49:02 +00:00
parent 695e417fd5
commit fcb441cbd7
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
retroshare-nogui/src/rpc/proto/rpcprotochat.cc
View File

@ -1001,8 +1001,7 @@ int RpcProtoChat::processReqSendMessage(uint32_t chan_id, uint32_t /*msg_id*/, u
// Send the message. // Send the message.
bool priv_or_lobby = true; bool priv_or_lobby = true;
std::string chat_id; std::string chat_id;
std::wstring chat_msg; std::string chat_msg = req.msg().msg() ;
convertUTF8toWString(req.msg().msg(), chat_msg);
std::cerr << "Chat Message is: " << req.msg().msg(); std::cerr << "Chat Message is: " << req.msg().msg();
std::cerr << std::endl; std::cerr << std::endl;
@ -1146,9 +1145,7 @@ int RpcProtoChat::locked_checkForEvents(uint32_t event, const std::list<RpcEvent
std::cerr << " name: " << it->peer_nickname; std::cerr << " name: " << it->peer_nickname;
std::cerr << std::endl; std::cerr << std::endl;
{ {
std::string msg_utf8; std::cerr << " Msg: " << it->msg ;
librs::util::ConvertUtf16ToUtf8(it->msg, msg_utf8);
std::cerr << " Msg: " << msg_utf8;
std::cerr << std::endl; std::cerr << std::endl;
} }
@ -1222,9 +1219,7 @@ int RpcProtoChat::locked_checkForEvents(uint32_t event, const std::list<RpcEvent
std::cerr << " name: " << it->peer_nickname; std::cerr << " name: " << it->peer_nickname;
std::cerr << std::endl; std::cerr << std::endl;
{ {
std::string msg_utf8; std::cerr << " Msg: " << it->msg;
librs::util::ConvertUtf16ToUtf8(it->msg, msg_utf8);
std::cerr << " Msg: " << msg_utf8;
std::cerr << std::endl; std::cerr << std::endl;
} }
/* must send to all registered clients */ /* must send to all registered clients */
@ -1427,16 +1422,7 @@ bool createQueuedEventSendMsg(const ChatInfo &chatinfo, rsctrl::chat::ChatType c
msg->set_chat_flags(chatinfo.chatflags); msg->set_chat_flags(chatinfo.chatflags);
msg->set_send_time(chatinfo.sendTime); msg->set_send_time(chatinfo.sendTime);
msg->set_recv_time(chatinfo.recvTime); msg->set_recv_time(chatinfo.recvTime);
msg->set_msg(chatinfo.msg);
std::string msg_utf8;
if (!convertWStringToUTF8(chatinfo.msg, msg_utf8))
{
std::cerr << "RpcProtoChat::createQueuedEventSendMsg() ERROR Converting Msg";
std::cerr << std::endl;
return false;
}
msg->set_msg(msg_utf8);
/* DONE - Generate Reply */ /* DONE - Generate Reply */
std::string outmsg; std::string outmsg;