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

removed mentions to encrypted messages. Replaced by distant, with the appropriate flags. Removed old msg encryption code

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-02-20 10:34:11 +00:00
parent 3a7ef25adf
commit ab9cb2b600
6 changed files with 34 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/feeds/MsgItem.cpp
View file

@ -144,10 +144,7 @@ void MsgItem::updateItemStatic()
titleLabel->setText(title);
subjectLabel->setText(QString::fromUtf8(mi.title.c_str()));
if(mi.msgflags & RS_MSG_ENCRYPTED)
msgLabel->setText(RsHtml().formatText(NULL, QString("[%1]").arg(tr("Encrypted message")), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
else
msgLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(mi.msg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
msgLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(mi.msg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
std::list<FileInfo>::iterator it;
for(it = mi.files.begin(); it != mi.files.end(); ++it)
@ -162,9 +159,6 @@ void MsgItem::updateItemStatic()
playButton->setEnabled(false);
if(mi.msgflags & RS_MSG_ENCRYPTED)
replyButton->setEnabled(false) ;
if (mIsHome)
{
/* disable buttons */
@ -174,10 +168,6 @@ void MsgItem::updateItemStatic()
/* hide buttons */
clearButton->hide();
}
else
{
//deleteButton->setEnabled(false);
}
}