1 files changed, 9 insertions, 7 deletions
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
@@ -238,77 +238,73 @@ JID QtUserSearchWindow::getContactJID() const {
 		useSearchResult = true;
 	}
 
 	if (useSearchResult) {
 		if (dynamic_cast<UserSearchModel*>(model_)) {
 			UserSearchResult* userItem = static_cast<UserSearchResult*>(resultsPage_->results_->currentIndex().internalPointer());
 			if (userItem) { /* Remember to leave this if we change to dynamic cast */
 				jid = userItem->getJID();
 			}
 		} else {
 			int row = resultsPage_->results_->currentIndex().row();
 
 			Form::FormItem item = dynamic_cast<QtFormResultItemModel*>(model_)->getForm()->getItems().at(row);
 			JID fallbackJid;
 			foreach(FormField::ref field, item) {
 				if (field->getType() == FormField::JIDSingleType) {
 					jid = JID(field->getJIDSingleValue());
 					break;
 				}
 				if (field->getName() == "jid") {
 					fallbackJid = field->getValues()[0];
 				}
 			}
 			if (!jid.isValid()) {
 				jid = fallbackJid;
 			}
 		}
 	}
 	else {
 		jid = JID(Q2PSTRING(firstPage_->jid_->text().trimmed()));
 	}
 	return jid;
 }
 
 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);
 }
 
 void QtUserSearchWindow::show() {
 	clear();
 	QWidget::show();
 }
 
 void QtUserSearchWindow::addSavedServices(const std::vector<JID>& services) {
 	if (type_ == AddContact) {
 		firstPage_->service_->clear();
 		foreach (JID jid, services) {
 			firstPage_->service_->addItem(P2QSTRING(jid.toString()));
 		}
 		firstPage_->service_->clearEditText();
 	} else {
 		firstMultiJIDPage_->service_->clear();
 		foreach (JID jid, services) {
 			firstMultiJIDPage_->service_->addItem(P2QSTRING(jid.toString()));
 		}
 		firstMultiJIDPage_->service_->clearEditText();
 	}
 }
 
 void QtUserSearchWindow::setSearchFields(boost::shared_ptr<SearchPayload> fields) {
 	fieldsPage_->fetchingThrobber_->hide();
 	fieldsPage_->fetchingThrobber_->movie()->stop();
 	fieldsPage_->fetchingLabel_->hide();
 
 	fieldsPage_->instructionsLabel_->setText(fields->getInstructions() ? P2QSTRING(fields->getInstructions().get()) : "Enter search terms");
 	if (fields->getForm()) {
 		fieldsPage_->setFormWidget(new QtFormWidget(fields->getForm(), fieldsPage_));
 	} else {
 		fieldsPage_->setFormWidget(NULL);
 		bool enabled[8] = {fields->getNick(), fields->getNick(), fields->getFirst(), fields->getFirst(), fields->getLast(), fields->getLast(), fields->getEMail(), fields->getEMail()};
 		QWidget* legacySearchWidgets[8] = {fieldsPage_->nickInputLabel_, fieldsPage_->nickInput_, fieldsPage_->firstInputLabel_, fieldsPage_->firstInput_, fieldsPage_->lastInputLabel_, fieldsPage_->lastInput_, fieldsPage_->emailInputLabel_, fieldsPage_->emailInput_};
@@ -362,72 +358,78 @@ std::vector<JID> QtUserSearchWindow::getJIDs() const {
 	std::vector<JID> jids;
 	foreach (Contact::ref contact, contactVector_) {
 		jids.push_back(contact->jid);
 	}
 	return jids;
 }
 
 void QtUserSearchWindow::setCanStartImpromptuChats(bool supportsImpromptu) {
 	supportsImpromptu_ = supportsImpromptu;
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->contactList_->setMaximumNoOfContactsToOne(!supportsImpromptu_);
 	}
 }
 
 void QtUserSearchWindow::updateContacts(const std::vector<Contact::ref>& contacts) {
 	if (type_ != AddContact) {
 		firstMultiJIDPage_->contactList_->updateContacts(contacts);
 	}
 }
 
 void QtUserSearchWindow::addContacts(const std::vector<Contact::ref>& contacts) {
 	if (type_ != AddContact) {
 		/* prevent duplicate JIDs from appearing in the contact list */
 		foreach (Contact::ref newContact, contacts) {
 			bool found = false;
 			foreach (Contact::ref oldContact, contactVector_) {
 				if (newContact->jid == oldContact->jid) {
 					found = true;
 					break;
 				}
 			}
 			if (!found) {
 				contactVector_.push_back(newContact);
 			}
 		}
+		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));
+		}
 	}
 }
 
 void QtUserSearchWindow::setCanSupplyDescription(bool allowed) {
 	firstMultiJIDPage_->label->setVisible(allowed);
 	firstMultiJIDPage_->reason_->setVisible(allowed);
 }
 
 void QtUserSearchWindow::handleAddViaSearch() {
 	searchNext_ = true;
 	next();
 }
 
 void QtUserSearchWindow::handleListChanged(std::vector<Contact::ref> list) {
 	contactVector_ = list;
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
 void QtUserSearchWindow::handleJIDsAdded(std::vector<JID> 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_;
 	model_ = newModel;
 	resultsPage_->setNoResults(model_->rowCount() == 0);
 	resultsPage_->emitCompletenessCheck();
 }