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

- started changing distant chat so that it works with GXS ids instead of PGP ids. Something is still broken in

Browse source 
service control. Crypto is not done yet => distant chat is unencrypted.
- changed GUI for distant chat. Removed invitation system.
- added menu item to distant chat GXS ids from IdentityItem (only entry point for now).
- fixed bug in chat lobbies causing re-connexion of lobbies not to happen everytime (bug reported bu Lain)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-05-25 21:43:05 +00:00
parent d18878aa9c
commit b6c68d1812
22 changed files with 340 additions and 762 deletions
Download patch file Download diff file Expand all files Collapse all files

17
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -49,6 +49,7 @@
#include "util/HandleRichText.h"
#include <retroshare/rsstatus.h>
#include <retroshare/rsidentity.h>
#include <retroshare/rspeers.h>
#include <retroshare/rshistory.h>
#include <retroshare/rsmsgs.h>
@ -187,8 +188,8 @@ void ChatWidget::init(const RsPeerId &peerId, const QString &title)
mChatType = CHATTYPE_LOBBY;
} else {
uint32_t status;
RsPgpId pgp_id;
if (rsMsgs->getDistantChatStatus(peerId, status, pgp_id)) {
RsGxsId gxs_id;
if (rsMsgs->getDistantChatStatus(peerId, gxs_id, status)) {
mChatType = CHATTYPE_DISTANT;
} else {
mChatType = CHATTYPE_PRIVATE;
@ -952,10 +953,16 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
QString peerName ;
uint32_t stts ;
RsPgpId pgp_id ;
RsGxsId gxs_id ;
if(rsMsgs->getDistantChatStatus(peerId,stts,pgp_id))
peerName = QString::fromUtf8(rsPeers->getGPGName(pgp_id).c_str());
if(rsMsgs->getDistantChatStatus(peerId,gxs_id,stts))
{
RsIdentityDetails details ;
if(rsIdentity->getIdDetails(gxs_id,details))
peerName = QString::fromUtf8( details.mNickname.c_str() ) ;
else
peerName = QString::fromStdString(gxs_id.toStdString()) ;
}
else
peerName = QString::fromUtf8(rsPeers->getPeerName(peerId).c_str());