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

Fixed initial fill of the contact list in message composer when only trusted people is checked.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-10-09 15:19:17 +00:00
parent 894addedb4
commit a82ce123bb
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -214,9 +214,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI); ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI);
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP
| FriendSelectionWidget::SHOW_SSL | FriendSelectionWidget::SHOW_SSL
| FriendSelectionWidget::SHOW_GXS); | (ui.onlyTrustedKeys->isChecked() ? FriendSelectionWidget::SHOW_NONE : FriendSelectionWidget::SHOW_GXS));
//| (ui.onlyTrustedKeys->isChecked()? FriendSelectionWidget::SHOW_NONE : FriendSelectionWidget::SHOW_NON_FRIEND_GPG));
//ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP | FriendSelectionWidget::SHOW_SSL );
ui.friendSelectionWidget->start(); ui.friendSelectionWidget->start();
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
@ -698,7 +696,6 @@ void MessageComposer::peerStatusChanged(const QString& peer_id, int status)
enumType type; enumType type;
destinationType dtype ; destinationType dtype ;
std::string id; std::string id;
bool group;
if (getRecipientFromRow(row, type,dtype, id) && !id.empty() ) { if (getRecipientFromRow(row, type,dtype, id) && !id.empty() ) {
if (dtype == PEER_TYPE_SSL && QString::fromStdString(id) == peer_id) if (dtype == PEER_TYPE_SSL && QString::fromStdString(id) == peer_id)
@ -1228,7 +1225,6 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
enumType type; enumType type;
destinationType dtype ; destinationType dtype ;
std::string id; std::string id;
bool group;
if (!getRecipientFromRow(row, type,dtype, id) || id.empty()) if (!getRecipientFromRow(row, type,dtype, id) || id.empty())
continue ; continue ;
@ -1688,6 +1684,7 @@ void MessageComposer::addRecipient(enumType type, const RsGxsId& gxs_id)
setRecipientToRow(row, type, PEER_TYPE_GXS,gxs_id.toStdString()); setRecipientToRow(row, type, PEER_TYPE_GXS,gxs_id.toStdString());
} }
void MessageComposer::addRecipient(enumType type, const std::string& id) void MessageComposer::addRecipient(enumType type, const std::string& id)
{ {
// search existing or empty row // search existing or empty row
@ -1697,7 +1694,6 @@ void MessageComposer::addRecipient(enumType type, const std::string& id)
enumType rowType; enumType rowType;
std::string rowId; std::string rowId;
destinationType dtype ; destinationType dtype ;
bool rowGroup;
if (getRecipientFromRow(row, rowType, dtype,rowId)) if (getRecipientFromRow(row, rowType, dtype,rowId))
{ {