1 files changed, 332 insertions, 65 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index 2b11d02..babe115 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -11,58 +11,52 @@
 #include <QWizardPage>
 #include <QMovie>
+#include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Base/foreach.h>
-#include "Swift/Controllers/UIEvents/UIEventStream.h"
-#include "Swift/Controllers/UIEvents/RequestChatUIEvent.h"
-#include "Swift/Controllers/UIEvents/AddContactUIEvent.h"
-#include "Swift/QtUI/UserSearch/UserSearchModel.h"
-#include "Swift/QtUI/UserSearch/UserSearchDelegate.h"
-#include "Swift/QtUI/QtSwiftUtil.h"
-#include "Swift/QtUI/QtFormResultItemModel.h"
-#include "QtUserSearchFirstPage.h"
-#include "QtUserSearchFieldsPage.h"
-#include "QtUserSearchResultsPage.h"
-#include "QtUserSearchDetailsPage.h"
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
+#include <Swift/Controllers/UIEvents/AddContactUIEvent.h>
+#include <Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h>
+#include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>
+#include <Swift/QtUI/UserSearch/UserSearchModel.h>
+#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/QtFormResultItemModel.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchResultsPage.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
+#include <Swift/QtUI/UserSearch/QtContactListWidget.h>
+
+#include <Swiften/Base/Log.h>
 
 namespace Swift {
 
-QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups) : eventStream_(eventStream), type_(type), model_(NULL) {
+QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {
 	setupUi(this);
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 	setWindowIcon(QIcon(":/logo-icon-16.png"));
 #endif
-	QString title(type == UserSearchWindow::AddContact ? tr("Add Contact") : tr("Chat to User"));
+	QString title;
+	switch(type) {
+		case AddContact:
+			title = tr("Add Contact");
+			break;
+		case ChatToContact:
+			title = tr("Chat to Users");
+			break;
+		case InviteToChat:
+			title = tr("Add Users to Chat");
+			break;
+	}
 	setWindowTitle(title);
 
 	delegate_ = new UserSearchDelegate();
 
-	firstPage_ = new QtUserSearchFirstPage(type, title);
-	connect(firstPage_->byJID_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
-	connect(firstPage_->byLocalSearch_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
-	connect(firstPage_->byRemoteSearch_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
-#if QT_VERSION >= 0x040700
-		firstPage_->jid_->setPlaceholderText(tr("alice@wonderland.lit"));
-#endif
-	firstPage_->service_->setEnabled(false);
-	setPage(1, firstPage_);
-
-	fieldsPage_ = new QtUserSearchFieldsPage();
-	fieldsPage_->fetchingThrobber_->setMovie(new QMovie(":/icons/throbber.gif", QByteArray(), this));
-	fieldsPage_->fetchingThrobber_->movie()->stop();
-	setPage(2, fieldsPage_);
-
-	resultsPage_ = new QtUserSearchResultsPage();
-
-#ifdef SWIFT_PLATFORM_MACOSX
-	resultsPage_->results_->setAlternatingRowColors(true);
-#endif
-	if (type == AddContact) {
-		connect(resultsPage_, SIGNAL(onUserTriggersContinue()), this, SLOT(next()));
-	}
-	else {
-		connect(resultsPage_, SIGNAL(onUserTriggersContinue()), this, SLOT(accept()));
-	}
-	setPage(3, resultsPage_);
+	setFirstPage(title);
+	setSecondPage();
+	setThirdPage();
 
 	detailsPage_ = new QtUserSearchDetailsPage(groups);
@@ -79,5 +73,14 @@ QtUserSearchWindow::~QtUserSearchWindow() {
 
 void QtUserSearchWindow::handleCurrentChanged(int page) {
-	if (page == 2 && lastPage_ == 1) {
+	searchNext_ = false;
+	if (firstMultiJIDPage_) {
+		firstMultiJIDPage_->reset();
+	}
+	resultsPage_->emitCompletenessCheck();
+	if (page == 1 && lastPage_ == 3) {
+		addSearchedJIDToList(getContact());
+		setSecondPage();
+	}
+	else if (page == 2 && lastPage_ == 1) {
 		setError("");
 		/* next won't be called if JID is selected */
@@ -85,7 +88,20 @@ void QtUserSearchWindow::handleCurrentChanged(int page) {
 		clearForm();
 		onFormRequested(server);
+		setThirdPage();
 	}
 	else if (page == 3 && lastPage_ == 2) {
+		JID server = getServerToSearch();
 		handleSearch();
+
+		if (type_ == AddContact) {
+			bool remote = firstPage_->byRemoteSearch_->isChecked();
+			firstPage_->byRemoteSearch_->setChecked(remote);
+			firstPage_->service_->setEditText(P2QSTRING(server.toString()));
+		} else {
+			bool remote = firstMultiJIDPage_->byRemoteSearch_->isChecked();
+			setFirstPage();
+			firstMultiJIDPage_->byRemoteSearch_->setChecked(remote);
+			firstMultiJIDPage_->service_->setEditText(P2QSTRING(server.toString()));
+		}
 	}
 	else if (page == 4) {
@@ -98,20 +114,60 @@ void QtUserSearchWindow::handleCurrentChanged(int page) {
 
 JID QtUserSearchWindow::getServerToSearch() {
+	if (type_ == AddContact) {
 		return firstPage_->byRemoteSearch_->isChecked() ? JID(Q2PSTRING(firstPage_->service_->currentText().trimmed())) : myServer_;
+	} else {
+		return firstMultiJIDPage_->byRemoteSearch_->isChecked() ? JID(Q2PSTRING(firstMultiJIDPage_->service_->currentText().trimmed())) : myServer_;
+	}
 }
 
 void QtUserSearchWindow::handleAccepted() {
-	JID jid = getContactJID();
-
-	if (type_ == AddContact) {
+	JID jid;
+	std::vector<JID> jids;
+	switch(type_) {
+		case AddContact:
+			jid = getContactJID();
 			eventStream_->send(boost::make_shared<AddContactUIEvent>(jid, detailsPage_->getName(), detailsPage_->getSelectedGroups()));
-	}
-	else {
-		boost::shared_ptr<UIEvent> event(new RequestChatUIEvent(jid));
+			break;
+		case ChatToContact:
+			if (contactVector_.size() == 1) {
+				boost::shared_ptr<UIEvent> event(new RequestChatUIEvent(contactVector_[0]->jid));
 				eventStream_->send(event);
+				break;
+			}
+
+			foreach(Contact::ref contact, contactVector_) {
+				jids.push_back(contact->jid);
+			}
+
+			eventStream_->send(boost::make_shared<CreateImpromptuMUCUIEvent>(jids, JID(), Q2PSTRING(firstMultiJIDPage_->reason_->text())));
+			break;
+		case InviteToChat:
+			foreach(Contact::ref contact, contactVector_) {
+				jids.push_back(contact->jid);
+			}
+			eventStream_->send(boost::make_shared<InviteToMUCUIEvent>(roomJID_, jids, Q2PSTRING(firstMultiJIDPage_->reason_->text())));
+			break;
+	}
+}
+
+void QtUserSearchWindow::handleContactSuggestionRequested(const QString& text) {
+	std::string stdText = Q2PSTRING(text);
+	onContactSuggestionsRequested(stdText);
+}
+
+void QtUserSearchWindow::addContact() {
+	if (!!firstMultiJIDPage_->jid_->getContact()) {
+		contactVector_.push_back(firstMultiJIDPage_->jid_->getContact());
+		firstMultiJIDPage_->jid_->clear();
+	}
+	firstMultiJIDPage_->contactList_->setList(contactVector_);
+	firstMultiJIDPage_->emitCompletenessCheck();
+	if (type_ == ChatToContact) {
+		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
 int QtUserSearchWindow::nextId() const {
+	if (type_ == AddContact) {
 		switch (currentId()) {
 			case 1: return firstPage_->byJID_->isChecked() ? (type_ == AddContact ? 4 : -1) : 2;
@@ -121,4 +177,13 @@ int QtUserSearchWindow::nextId() const {
 			default: return -1;
 		}
+	} else {
+		switch (currentId()) {
+			case 1: return searchNext_ ? 2 : -1;
+			case 2: return 3;
+			case 3: return 1;
+			case 4: return -1;
+			default: return -1;
+		}
+	}
 }
 
@@ -148,15 +213,16 @@ void QtUserSearchWindow::handleSearch() {
 	if (fieldsPage_->getFormWidget()) {
 		search->setForm(fieldsPage_->getFormWidget()->getCompletedForm());
+		search->getForm()->clearEmptyTextFields();
 	} else {
-		if (fieldsPage_->nickInput_->isEnabled()) {
+		if (fieldsPage_->nickInput_->isEnabled() && !fieldsPage_->nickInput_->text().isEmpty()) {
 			search->setNick(Q2PSTRING(fieldsPage_->nickInput_->text()));
 		}
-		if (fieldsPage_->firstInput_->isEnabled()) {
+		if (fieldsPage_->firstInput_->isEnabled() && !fieldsPage_->firstInput_->text().isEmpty()) {
 			search->setFirst(Q2PSTRING(fieldsPage_->firstInput_->text()));
 		}
-		if (fieldsPage_->lastInput_->isEnabled()) {
+		if (fieldsPage_->lastInput_->isEnabled() && !fieldsPage_->lastInput_->text().isEmpty()) {
 			search->setLast(Q2PSTRING(fieldsPage_->lastInput_->text()));
 		}
-		if (fieldsPage_->emailInput_->isEnabled()) {
+		if (fieldsPage_->emailInput_->isEnabled() && !fieldsPage_->emailInput_->text().isEmpty()) {
 			search->setEMail(Q2PSTRING(fieldsPage_->emailInput_->text()));
 		}
@@ -167,5 +233,13 @@ void QtUserSearchWindow::handleSearch() {
 JID QtUserSearchWindow::getContactJID() const {
 	JID jid;
-	if (!firstPage_->byJID_->isChecked()) {
+
+	bool useSearchResult;
+	if (type_ == AddContact) {
+		useSearchResult = !firstPage_->byJID_->isChecked();
+	} else {
+		useSearchResult = true;
+	}
+
+	if (useSearchResult) {
 		if (dynamic_cast<UserSearchModel*>(model_)) {
 			UserSearchResult* userItem = static_cast<UserSearchResult*>(resultsPage_->results_->currentIndex().internalPointer());
@@ -173,5 +247,5 @@ JID QtUserSearchWindow::getContactJID() const {
 				jid = userItem->getJID();
 			}
-		} else {
+		} else if (dynamic_cast<QtFormResultItemModel*>(model_)) {
 			int row = resultsPage_->results_->currentIndex().row();
 
@@ -179,10 +253,10 @@ JID QtUserSearchWindow::getContactJID() const {
 			JID fallbackJid;
 			foreach(FormField::ref field, item) {
-				if (boost::dynamic_pointer_cast<JIDSingleFormField>(field)) {
-					jid = JID(field->getRawValues().at(0));
+				if (field->getType() == FormField::JIDSingleType) {
+					jid = JID(field->getJIDSingleValue());
 					break;
 				}
 				if (field->getName() == "jid") {
-					fallbackJid = field->getRawValues().at(0);
+					fallbackJid = field->getValues()[0];
 				}
 			}
@@ -198,4 +272,19 @@ JID QtUserSearchWindow::getContactJID() const {
 }
 
+Contact::ref QtUserSearchWindow::getContact() const {
+	return boost::make_shared<Contact>("", getContactJID(), StatusShow::None, "");
+}
+
+void QtUserSearchWindow::addSearchedJIDToList(const Contact::ref& contact) {
+	std::vector<JID> jids;
+	jids.push_back(contact->jid);
+	handleJIDsAdded(jids);
+	firstMultiJIDPage_->jid_->clear();
+}
+
+void QtUserSearchWindow::handleOnSearchedJIDSelected(const Contact::ref& contact) {
+	firstPage_->jid_->setText(P2QSTRING(contact->jid.toString()));
+}
+
 void QtUserSearchWindow::show() {
 	clear();
@@ -204,4 +293,5 @@ void QtUserSearchWindow::show() {
 
 void QtUserSearchWindow::addSavedServices(const std::vector<JID>& services) {
+	if (type_ == AddContact) {
 		firstPage_->service_->clear();
 		foreach (JID jid, services) {
@@ -209,4 +299,11 @@ void QtUserSearchWindow::addSavedServices(const std::vector<JID>& services) {
 		}
 		firstPage_->service_->clearEditText();
+	} else {
+		firstMultiJIDPage_->service_->clear();
+		foreach (JID jid, services) {
+			firstMultiJIDPage_->service_->addItem(P2QSTRING(jid.toString()));
+		}
+		firstMultiJIDPage_->service_->clearEditText();
+	}
 }
 
@@ -221,5 +318,5 @@ void QtUserSearchWindow::setSearchFields(boost::shared_ptr<SearchPayload> fields
 	} else {
 		fieldsPage_->setFormWidget(NULL);
-		bool enabled[8] = {fields->getNick(), fields->getNick(), fields->getFirst(), fields->getFirst(), fields->getLast(), fields->getLast(), fields->getEMail(), fields->getEMail()};
+		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_};
 		for (int i = 0; i < 8; i++) {
@@ -246,4 +343,95 @@ void QtUserSearchWindow::prepopulateJIDAndName(const JID& jid, const std::string
 }
 
+void QtUserSearchWindow::setContactSuggestions(const std::vector<Contact::ref>& suggestions) {
+	if (type_ == AddContact) {
+		firstPage_->jid_->setSuggestions(suggestions);
+	} else {
+		firstMultiJIDPage_->jid_->setSuggestions(suggestions);
+	}
+}
+
+void QtUserSearchWindow::setJIDs(const std::vector<JID> &jids) {
+	foreach(JID jid, jids) {
+		addSearchedJIDToList(boost::make_shared<Contact>("", jid, StatusShow::None, ""));
+	}
+	onJIDUpdateRequested(jids);
+}
+
+void QtUserSearchWindow::setRoomJID(const JID& roomJID) {
+	roomJID_ = roomJID;
+}
+
+std::string QtUserSearchWindow::getReason() const {
+	return Q2PSTRING(firstMultiJIDPage_->reason_->text());
+}
+
+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();
@@ -255,4 +443,5 @@ void QtUserSearchWindow::setResults(const std::vector<UserSearchResult>& results
 	model_ = newModel;
 	resultsPage_->setNoResults(model_->rowCount() == 0);
+	resultsPage_->emitCompletenessCheck();
 }
 
@@ -263,8 +452,13 @@ void QtUserSearchWindow::setResultsForm(Form::ref results) {
 	resultsPage_->results_->setItemDelegate(new QItemDelegate());
 	resultsPage_->results_->setHeaderHidden(false);
+#if QT_VERSION >= 0x050000
+	resultsPage_->results_->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else
 	resultsPage_->results_->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif
 	delete model_;
 	model_ = newModel;
 	resultsPage_->setNoResults(model_->rowCount() == 0);
+	resultsPage_->emitCompletenessCheck();
 }
 
@@ -273,4 +467,61 @@ void QtUserSearchWindow::setSelectedService(const JID& jid) {
 }
 
+void QtUserSearchWindow::setFirstPage(QString title) {
+	if (page(1) != 0) {
+		removePage(1);
+	}
+	if (type_ == AddContact) {
+		firstPage_ = new QtUserSearchFirstPage(type_, title.isEmpty() ? firstPage_->title() : title, settings_);
+		connect(firstPage_->jid_, SIGNAL(textEdited(QString)), this, SLOT(handleContactSuggestionRequested(QString)));
+		firstPage_->jid_->onUserSelected.connect(boost::bind(&QtUserSearchWindow::handleOnSearchedJIDSelected, this, _1));
+		connect(firstPage_->byJID_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
+		connect(firstPage_->byLocalSearch_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
+		connect(firstPage_->byRemoteSearch_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
+#if QT_VERSION >= 0x040700
+		firstPage_->jid_->setPlaceholderText(tr("alice@wonderland.lit"));
+#endif
+		firstPage_->service_->setEnabled(false);
+		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::ref>)), this, SLOT(handleListChanged(std::vector<Contact::ref>)));
+		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();
+	fieldsPage_->fetchingThrobber_->setMovie(new QMovie(":/icons/throbber.gif", QByteArray(), this));
+	fieldsPage_->fetchingThrobber_->movie()->stop();
+	setPage(2, fieldsPage_);
+}
+
+void QtUserSearchWindow::setThirdPage() {
+	if (page(3) != 0) {
+		removePage(3);
+	}
+	resultsPage_ = new QtUserSearchResultsPage();
+
+#ifdef SWIFT_PLATFORM_MACOSX
+	resultsPage_->results_->setAlternatingRowColors(true);
+#endif
+	if (type_ == AddContact) {
+		connect(resultsPage_, SIGNAL(onUserTriggersContinue()), this, SLOT(next()));
+	}
+	else {
+		connect(resultsPage_, SIGNAL(onUserTriggersContinue()), this, SLOT(next()));
+	}
+	setPage(3, resultsPage_);
+}
+
 void QtUserSearchWindow::clearForm() {
 	fieldsPage_->fetchingThrobber_->show();
@@ -288,19 +539,26 @@ void QtUserSearchWindow::clearForm() {
 
 void QtUserSearchWindow::clear() {
-	firstPage_->errorLabel_->setVisible(false);
 	QString howText;
 	if (type_ == AddContact) {
+		firstPage_->errorLabel_->setVisible(false);
 		howText = QString(tr("How would you like to find the user to add?"));
-	}
-	else {
-		howText = QString(tr("How would you like to find the user to chat to?"));
-	}
 		firstPage_->howLabel_->setText(howText);
 		firstPage_->byJID_->setChecked(true);
+		handleFirstPageRadioChange();
+	} else {
+		contactVector_.clear();
+		firstMultiJIDPage_->contactList_->setList(contactVector_);
+		firstMultiJIDPage_->errorLabel_->setVisible(false);
+		if (type_ == ChatToContact) {
+			howText = QString(tr("Who would you like to chat to?"));
+		} else if (type_ == InviteToChat) {
+			howText = QString(tr("Who do you want to invite to the chat?"));
+		}
+		firstMultiJIDPage_->howLabel_->setText(howText);
+	}
 	clearForm();
 	resultsPage_->results_->setModel(NULL);
 	delete model_;
 	model_ = NULL;
-	handleFirstPageRadioChange();
 	restart();
 	lastPage_ = 1;
@@ -309,9 +567,18 @@ void QtUserSearchWindow::clear() {
 void QtUserSearchWindow::setError(const QString& error) {
 	if (error.isEmpty()) {
+		if (type_ == AddContact) {
 			firstPage_->errorLabel_->hide();
+		} else {
+			firstMultiJIDPage_->errorLabel_->hide();
+		}
 	}
 	else {
+		if (type_ == AddContact) {
 			firstPage_->errorLabel_->setText(QString("<font color='red'>%1</font>").arg(error));
 			firstPage_->errorLabel_->show();
+		} else {
+			firstMultiJIDPage_->errorLabel_->setText(QString("<font color='red'>%1</font>").arg(error));
+			firstMultiJIDPage_->errorLabel_->show();
+		}
 		restart();
 		lastPage_ = 1;