1 files changed, 16 insertions, 10 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index 3e734df..d90a3f8 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -91,55 +91,61 @@ void UserSearchController::handleDiscoServiceFound(const JID& jid, boost::shared
 		if ((identity.getCategory() == "directory"
 			&& identity.getType() == "user")) {
 			//isUserDirectory = true;
 		}
 	}
 	std::vector<std::string> features = info->getFeatures();
 	supports55 = std::find(features.begin(), features.end(), DiscoInfo::JabberSearchFeature) != features.end();
 	if (/*isUserDirectory && */supports55) { //FIXME: once M-Link correctly advertises directoryness.
 		/* Abort further searches.*/
 		endDiscoWalker();
 		boost::shared_ptr<GenericRequest<SearchPayload> > searchRequest(new GenericRequest<SearchPayload>(IQ::Get, jid, boost::shared_ptr<SearchPayload>(new SearchPayload()), iqRouter_));
 		searchRequest->onResponse.connect(boost::bind(&UserSearchController::handleFormResponse, this, _1, _2));
 		searchRequest->send();
 	}
 }
 
 void UserSearchController::handleFormResponse(boost::shared_ptr<SearchPayload> fields, ErrorPayload::ref error) {
 	if (error || !fields) {
 		window_->setServerSupportsSearch(false);
 		return;
 	}
 	window_->setSearchFields(fields);
 }
 
 void UserSearchController::handleSearch(boost::shared_ptr<SearchPayload> fields, const JID& jid) {
 	boost::shared_ptr<GenericRequest<SearchPayload> > searchRequest(new GenericRequest<SearchPayload>(IQ::Set, jid, fields, iqRouter_));
 	searchRequest->onResponse.connect(boost::bind(&UserSearchController::handleSearchResponse, this, _1, _2));
 	searchRequest->send();
 }
 
 void UserSearchController::handleSearchResponse(boost::shared_ptr<SearchPayload> resultsPayload, ErrorPayload::ref error) {
 	if (error || !resultsPayload) {
 		window_->setSearchError(true);
 		return;
 	}
+
 	std::vector<UserSearchResult> results;
-	foreach (SearchPayload::Item item, resultsPayload->getItems()) {
-		JID jid(item.jid);
-		std::map<std::string, std::string> fields;
-		fields["first"] = item.first;
-		fields["last"] = item.last;
-		fields["nick"] = item.nick;
-		fields["email"] = item.email;
-		UserSearchResult result(jid, fields);
-		results.push_back(result);
+
+	if (resultsPayload->getForm()) {
+		window_->setResultsForm(resultsPayload->getForm());
+	} else {
+		foreach (SearchPayload::Item item, resultsPayload->getItems()) {
+			JID jid(item.jid);
+			std::map<std::string, std::string> fields;
+			fields["first"] = item.first;
+			fields["last"] = item.last;
+			fields["nick"] = item.nick;
+			fields["email"] = item.email;
+			UserSearchResult result(jid, fields);
+			results.push_back(result);
+		}
+		window_->setResults(results);
 	}
-	window_->setResults(results);
 }
 
 void UserSearchController::handleDiscoWalkFinished() {
 	window_->setServerSupportsSearch(false);
 	endDiscoWalker();
 }
 
 }