Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-23 08:11:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging branches/v0.6-initdev into trunk.

Browse source 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-02-01 14:16:15 +00:00
commit c0738eec7f
407 changed files with 23716 additions and 50779 deletions
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.
bool priv_or_lobby = true;
std::string chat_id;
std::wstring chat_msg;
convertUTF8toWString(req.msg().msg(), chat_msg);
std::string chat_msg = req.msg().msg() ;
std::cerr << "Chat Message is: " << req.msg().msg();
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 << std::endl;
{
std::string msg_utf8;
librs::util::ConvertUtf16ToUtf8(it->msg, msg_utf8);
std::cerr << " Msg: " << msg_utf8;
std::cerr << " Msg: " << it->msg ;
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 << std::endl;
{
std::string msg_utf8;
librs::util::ConvertUtf16ToUtf8(it->msg, msg_utf8);
std::cerr << " Msg: " << msg_utf8;
std::cerr << " Msg: " << it->msg;
std::cerr << std::endl;
}
/* 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_send_time(chatinfo.sendTime);
msg->set_recv_time(chatinfo.recvTime);
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);
msg->set_msg(chatinfo.msg);
/* DONE - Generate Reply */
std::string outmsg;

2
retroshare-nogui/src/rpc/proto/rpcprotopeers.cc
View file

@ -515,7 +515,7 @@ bool load_person_details(std::string pgp_id, rsctrl::core::Person *person,
else
{
std::list<std::string> common_friends;
rsDisc->getDiscGPGFriends(pgp_id, common_friends);
rsDisc->getDiscPgpFriends(pgp_id, common_friends);
int size = common_friends.size();
if (size)
{