1 files changed, 19 insertions, 0 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index babe115..b197483 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -164,12 +164,26 @@ void QtUserSearchWindow::addContact() {
 	firstMultiJIDPage_->emitCompletenessCheck();
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
+void QtUserSearchWindow::setWarning(const boost::optional<std::string>& message) {
+	if (message) {
+		firstPage_->jidWarning_->setToolTip(P2QSTRING((*message)));
+		firstPage_->jidWarning_->setAccessibleDescription(P2QSTRING((*message)));
+		firstPage_->jidWarning_->show();
+	}
+	else {
+		firstPage_->jidWarning_->setToolTip("");
+		firstPage_->jidWarning_->setAccessibleDescription("");
+		firstPage_->jidWarning_->hide();
+	}
+	firstPage_->emitCompletenessCheck();
+}
+
 int QtUserSearchWindow::nextId() const {
 	if (type_ == AddContact) {
 		switch (currentId()) {
 			case 1: return firstPage_->byJID_->isChecked() ? (type_ == AddContact ? 4 : -1) : 2;
 			case 2: return 3;
 			case 3: return type_ == AddContact ? 4 : -1;
@@ -463,19 +477,24 @@ void QtUserSearchWindow::setResultsForm(Form::ref results) {
 }
 
 void QtUserSearchWindow::setSelectedService(const JID& jid) {
 	myServer_ = jid;
 }
 
+void QtUserSearchWindow::handleJIDEditingDone() {
+	onJIDEditFieldChanged(JID(Q2PSTRING(firstPage_->jid_->text())));
+}
+
 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)));
+		connect(firstPage_->jid_, SIGNAL(textEdited(QString)), this, SLOT(handleJIDEditingDone()), Qt::UniqueConnection);
 		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"));