4 files changed, 16 insertions, 7 deletions
diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.cpp b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
index 4adc929..6504f3e 100644
--- a/Swift/QtUI/UserSearch/QtContactListWidget.cpp
+++ b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
@@ -78,4 +78,8 @@ void QtContactListWidget::setMaximumNoOfContactsToOne(bool limited) {
 }
 
+bool QtContactListWidget::isFull() const {
+	return limited_ && (getList().size() == 1);
+}
+
 void QtContactListWidget::updateContacts(const std::vector<Contact::ref>& contactUpdates) {
 	std::vector<Contact::ref> contacts = contactListModel_->getList();
diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.h b/Swift/QtUI/UserSearch/QtContactListWidget.h
index 601d320..112f3ee 100644
--- a/Swift/QtUI/UserSearch/QtContactListWidget.h
+++ b/Swift/QtUI/UserSearch/QtContactListWidget.h
@@ -41,4 +41,5 @@ public:
 	Contact::ref getContact(const size_t i);
 	void setMaximumNoOfContactsToOne(bool limited);
+	bool isFull() const;
 
 public slots:
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
index 597c88b..8ea49c4 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
@@ -73,7 +73,9 @@ void QtUserSearchFirstMultiJIDPage::dragEnterEvent(QDragEnterEvent *event) {
 	if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")
 		|| event->mimeData()->hasFormat("application/vnd.swift.contact-jid-muc")) {
+			if (!contactList_->isFull()) {
 				event->acceptProposedAction();
 			}
 	}
+}
 
 void QtUserSearchFirstMultiJIDPage::dropEvent(QDropEvent *event) {
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index 40b4e28..260ccfe 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -271,11 +271,7 @@ JID QtUserSearchWindow::getContactJID() const {
 
 void QtUserSearchWindow::addSearchedJIDToList(const JID& jid) {
-	Contact::ref contact = boost::make_shared<Contact>(jid, jid.toString(), StatusShow::None, "");
-	contactVector_.push_back(contact);
-	firstMultiJIDPage_->contactList_->setList(contactVector_);
-	firstMultiJIDPage_->emitCompletenessCheck();
-	if (type_ == ChatToContact) {
-		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
-	}
+	std::vector<JID> jids;
+	jids.push_back(jid);
+	handleJIDsAdded(jids);
 }
 
@@ -395,6 +391,12 @@ void QtUserSearchWindow::addContacts(const std::vector<Contact::ref>& contacts)
 			}
 		}
+		if (!supportsImpromptu_ && contactVector_.size() > 1) {
+			contactVector_.resize(1); /* can't chat with more than one user */
+		}
 		firstMultiJIDPage_->contactList_->setList(contactVector_);
 		firstMultiJIDPage_->emitCompletenessCheck();
+		if (type_ == ChatToContact) {
+			firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? true : (contactVector_.size() < 1));
+		}
 	}
 }