1 files changed, 23 insertions, 2 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index c0c7972..ec5dd39 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2013 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swift/QtUI/UserSearch/QtUserSearchWindow.h"
 
 #include <QItemDelegate>
 #include <QModelIndex>
 #include <QWizardPage>
@@ -371,32 +371,52 @@ void QtUserSearchWindow::setCanStartImpromptuChats(bool supportsImpromptu) {
 	}
 }
 
 void QtUserSearchWindow::updateContacts(const std::vector<Contact>& contacts) {
 	if (type_ != AddContact) {
 		firstMultiJIDPage_->contactList_->updateContacts(contacts);
 	}
 }
 
+void QtUserSearchWindow::addContacts(const std::vector<Contact>& contacts) {
+	if (type_ != AddContact) {
+		/* prevent duplicate JIDs from appearing in the contact list */
+		foreach (const Contact& newContact, contacts) {
+			bool found = false;
+			foreach (const Contact& oldContact, contactVector_) {
+				if (newContact.jid == oldContact.jid) {
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				contactVector_.push_back(newContact);
+			}
+		}
+		firstMultiJIDPage_->contactList_->setList(contactVector_);
+		firstMultiJIDPage_->emitCompletenessCheck();
+	}
+}
+
 void QtUserSearchWindow::handleAddViaSearch() {
 	searchNext_ = true;
 	next();
 }
 
 void QtUserSearchWindow::handleListChanged(std::vector<Contact> list) {
 	contactVector_ = list;
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
 void QtUserSearchWindow::handleJIDsAdded(std::vector<JID> jids) {
-	onJIDUpdateRequested(jids);
+	onJIDAddRequested(jids);
 }
 
 void QtUserSearchWindow::setResults(const std::vector<UserSearchResult>& results) {
 	UserSearchModel *newModel = new UserSearchModel();
 	newModel->setResults(results);
 	resultsPage_->results_->setModel(newModel);
 	resultsPage_->results_->setItemDelegate(delegate_);
 	resultsPage_->results_->setHeaderHidden(true);
 	delete model_;
@@ -443,18 +463,19 @@ void QtUserSearchWindow::setFirstPage(QString title) {
 		setPage(1, firstPage_);
 	} else {
 		firstMultiJIDPage_ = new QtUserSearchFirstMultiJIDPage(type_, title.isEmpty() ? firstMultiJIDPage_->title() : title, settings_);
 		connect(firstMultiJIDPage_->addContactButton_, SIGNAL(clicked()), this, SLOT(addContact()));
 		connect(firstMultiJIDPage_->jid_, SIGNAL(textEdited(QString)), this, SLOT(handleContactSuggestionRequested(QString)));
 		firstMultiJIDPage_->jid_->onUserSelected.connect(boost::bind(&QtUserSearchWindow::addSearchedJIDToList, this, _1));
 		connect(firstMultiJIDPage_->addViaSearchButton_, SIGNAL(clicked()), this, SLOT(handleAddViaSearch()));
 		connect(firstMultiJIDPage_->contactList_, SIGNAL(onListChanged(std::vector<Contact>)), this, SLOT(handleListChanged(std::vector<Contact>)));
 		connect(firstMultiJIDPage_->contactList_, SIGNAL(onJIDsAdded(std::vector<JID>)), this, SLOT(handleJIDsAdded(std::vector<JID>)));
+		connect(firstMultiJIDPage_, SIGNAL(onJIDsDropped(std::vector<JID>)), this, SLOT(handleJIDsAdded(std::vector<JID>)));
 		setPage(1, firstMultiJIDPage_);
 	}
 }
 
 void QtUserSearchWindow::setSecondPage() {
 	if (page(2) != 0) {
 		removePage(2);
 	}
 	fieldsPage_ = new QtUserSearchFieldsPage();