From 8edc8511c3bc545dd547068df5f51a1ebf117d3c Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Fri, 7 Nov 2014 19:06:23 +0000
Subject: [PATCH] fixed adding groups to message recipient (Patch from Phenom,
 modified)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/msgs/MessageComposer.cpp          | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 232a20534..1155e5774 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -2348,23 +2348,15 @@ void MessageComposer::fileHashingFinished(QList<HashedFile> hashedFiles)
 
 void MessageComposer::addContact(enumType type)
 {
-	//  std::list<std::string> ids;
-	//  ui.friendSelectionWidget->selectedIds<std::string,FriendSelectionWidget::IDTYPE_GROUP>(ids,false);
-	//
-	//  std::list<std::string>::iterator idIt;
-	//  for (idIt = ids.begin(); idIt != ids.end(); ++idIt) {
-	//      addRecipient(type, *idIt, true);
-	//  }
+	std::list<RsPeerId> peerIds ;
+	ui.friendSelectionWidget->selectedIds<RsPeerId,FriendSelectionWidget::IDTYPE_SSL>(peerIds, false);
 
-	std::list<RsPeerId> ids ;
-	ui.friendSelectionWidget->selectedIds<RsPeerId,FriendSelectionWidget::IDTYPE_SSL>(ids, true);
-	for (std::list<RsPeerId>::const_iterator idIt = ids.begin(); idIt != ids.end(); ++idIt) {
-        addRecipient(type, *idIt);
-	}
+	for (std::list<RsPeerId>::const_iterator idIt = peerIds.begin(); idIt != peerIds.end(); ++idIt) 
+		addRecipient(type, *idIt);
 
-	std::list<RsGxsId> id2 ;
-	ui.friendSelectionWidget->selectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(id2, true);
-	for (std::list<RsGxsId>::const_iterator idIt = id2.begin(); idIt != id2.end(); ++idIt)
+	std::list<RsGxsId> gxsIds ;
+	ui.friendSelectionWidget->selectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(gxsIds, false);
+	for (std::list<RsGxsId>::const_iterator idIt = gxsIds.begin(); idIt != gxsIds.end(); ++idIt) 
 		addRecipient(type, *idIt);
 }