Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-22 21:34:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ported branch v0.5.0 commits 2623, 2624, 2626, 2633, 2634, 2643, 2644, 2646, 2651 and 2654 to trunk

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-28 20:46:45 +00:00
parent 12536efd16
commit 08065b4298
22 changed files with 264 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/services/p3chatservice.cc
View file

@ -594,15 +594,17 @@ void p3ChatService::sendAvatarJpegData(const std::string& peer_id)
// take avatar, and embed it into a std::wstring.
//
#ifdef CHAT_DEBUG
std::cerr << "p3ChatService::sending avatar image to peer" << peer_id << ", image size = " << ci->image_size << std::endl ;
std::cerr << std::endl;
#endif
sendItem(ci) ;
}
else {
#ifdef CHAT_DEBUG
#ifdef CHAT_DEBUG
std::cerr << "Doing nothing" << std::endl ;
#endif
#endif
}
}

2
libretroshare/src/services/p3ranking.cc
View file

@ -423,6 +423,7 @@ void p3Ranking::addRankMsg(RsRankLinkMsg *msg)
RankGroup grp;
grp.rid = rid;
grp.ownTag = false;
grp.rank = 0.0f;
/*************************************************************************/
/****************************** LINK SPECIFIC ****************************/
@ -438,7 +439,6 @@ void p3Ranking::addRankMsg(RsRankLinkMsg *msg)
mData[rid] = grp;
it = mData.find(rid);
if (id == "")
{
#ifdef RANK_DEBUG