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

fixed compilation

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-06-12 17:05:49 +00:00
parent b44e469e0e
commit 1c00055ea9
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -802,13 +802,10 @@ void IdDialog::chatIdentity()
std::string keyId = item->text(RSID_COL_KEYID).toStdString(); std::string keyId = item->text(RSID_COL_KEYID).toStdString();
DistantChatPeerId virtual_peer_id ;
uint32_t error_code ; uint32_t error_code ;
if(!rsMsgs->initiateDistantChatConnexion(RsGxsId(keyId), virtual_peer_id, error_code)) if(!rsMsgs->initiateDistantChatConnexion(RsGxsId(keyId), error_code))
QMessageBox::information(NULL,"Distant cannot work","Distant chat refused with this peer. Reason: "+QString::number(error_code)) ; QMessageBox::information(NULL,"Distant cannot work","Distant chat refused with this peer. Reason: "+QString::number(error_code)) ;
else
ChatDialog::chatFriend(virtual_peer_id);
} }

5
retroshare-gui/src/gui/People/IdentityItem.cpp
View file

@ -187,13 +187,10 @@ void IdentityItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
void IdentityItem::distantChat() void IdentityItem::distantChat()
{ {
DistantChatPeerId virtual_peer_id ;
uint32_t error_code ; uint32_t error_code ;
if(!rsMsgs->initiateDistantChatConnexion(RsGxsId(_group_info.mMeta.mGroupId), virtual_peer_id, error_code)) if(!rsMsgs->initiateDistantChatConnexion(RsGxsId(_group_info.mMeta.mGroupId), error_code))
QMessageBox::information(NULL,"Distant cannot work","Distant chat refused with this peer. Reason: "+QString::number(error_code)) ; QMessageBox::information(NULL,"Distant cannot work","Distant chat refused with this peer. Reason: "+QString::number(error_code)) ;
else
ChatDialog::chatFriend(virtual_peer_id);
} }
void IdentityItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void IdentityItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)

5
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -141,12 +141,9 @@ void ChatPage::collectedInvite_openDistantChat()
std::cerr << "Openning secured chat tunnel for virtual peer id " << gxs_id << ". Please wait..." << std::endl; std::cerr << "Openning secured chat tunnel for virtual peer id " << gxs_id << ". Please wait..." << std::endl;
uint32_t error_code ; uint32_t error_code ;
DistantChatPeerId dcpid ;
if(!rsMsgs->initiateDistantChatConnexion(gxs_id,dcpid,error_code)) if(!rsMsgs->initiateDistantChatConnexion(gxs_id,error_code))
QMessageBox::critical(NULL,tr("Can't open distant chat"),tr("Cannot open distant chat. Error code=")+QString::number(error_code)) ; QMessageBox::critical(NULL,tr("Can't open distant chat"),tr("Cannot open distant chat. Error code=")+QString::number(error_code)) ;
else
ChatDialog::chatFriend(dcpid);
} }
/** Saves the changes on this page */ /** Saves the changes on this page */