1 files changed, 282 insertions, 282 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index e08912a..216488a 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -36,357 +36,357 @@ namespace Swift {
 static const std::string SEARCHED_DIRECTORIES = "searchedDirectories";
 
 UserSearchController::UserSearchController(Type type, const JID& jid, UIEventStream* uiEventStream, VCardManager* vcardManager, UserSearchWindowFactory* factory, IQRouter* iqRouter, RosterController* rosterController, ContactSuggester* contactSuggester, AvatarManager* avatarManager, PresenceOracle* presenceOracle, ProfileSettingsProvider* settings) : type_(type), jid_(jid), uiEventStream_(uiEventStream), vcardManager_(vcardManager), factory_(factory), iqRouter_(iqRouter), rosterController_(rosterController), contactSuggester_(contactSuggester), avatarManager_(avatarManager), presenceOracle_(presenceOracle), settings_(settings) {
-	uiEventStream_->onUIEvent.connect(boost::bind(&UserSearchController::handleUIEvent, this, _1));
-	vcardManager_->onVCardChanged.connect(boost::bind(&UserSearchController::handleVCardChanged, this, _1, _2));
-	avatarManager_->onAvatarChanged.connect(boost::bind(&UserSearchController::handleAvatarChanged, this, _1));
-	presenceOracle_->onPresenceChange.connect(boost::bind(&UserSearchController::handlePresenceChanged, this, _1));
-	window_ = NULL;
-	discoWalker_ = NULL;
-	loadSavedDirectories();
+    uiEventStream_->onUIEvent.connect(boost::bind(&UserSearchController::handleUIEvent, this, _1));
+    vcardManager_->onVCardChanged.connect(boost::bind(&UserSearchController::handleVCardChanged, this, _1, _2));
+    avatarManager_->onAvatarChanged.connect(boost::bind(&UserSearchController::handleAvatarChanged, this, _1));
+    presenceOracle_->onPresenceChange.connect(boost::bind(&UserSearchController::handlePresenceChanged, this, _1));
+    window_ = NULL;
+    discoWalker_ = NULL;
+    loadSavedDirectories();
 }
 
 UserSearchController::~UserSearchController() {
-	endDiscoWalker();
-	delete discoWalker_;
-	if (window_) {
-		window_->onNameSuggestionRequested.disconnect(boost::bind(&UserSearchController::handleNameSuggestionRequest, this, _1));
-		window_->onFormRequested.disconnect(boost::bind(&UserSearchController::handleFormRequested, this, _1));
-		window_->onSearchRequested.disconnect(boost::bind(&UserSearchController::handleSearch, this, _1, _2));
-		window_->onContactSuggestionsRequested.disconnect(boost::bind(&UserSearchController::handleContactSuggestionsRequested, this, _1));
-		window_->onJIDUpdateRequested.disconnect(boost::bind(&UserSearchController::handleJIDUpdateRequested, this, _1));
-		window_->onJIDAddRequested.disconnect(boost::bind(&UserSearchController::handleJIDAddRequested, this, _1));
-		window_->onJIDEditFieldChanged.disconnect(boost::bind(&UserSearchController::handleJIDEditingFinished, this, _1));
-		delete window_;
-	}
-	presenceOracle_->onPresenceChange.disconnect(boost::bind(&UserSearchController::handlePresenceChanged, this, _1));
-	avatarManager_->onAvatarChanged.disconnect(boost::bind(&UserSearchController::handleAvatarChanged, this, _1));
-	vcardManager_->onVCardChanged.disconnect(boost::bind(&UserSearchController::handleVCardChanged, this, _1, _2));
-	uiEventStream_->onUIEvent.disconnect(boost::bind(&UserSearchController::handleUIEvent, this, _1));
+    endDiscoWalker();
+    delete discoWalker_;
+    if (window_) {
+        window_->onNameSuggestionRequested.disconnect(boost::bind(&UserSearchController::handleNameSuggestionRequest, this, _1));
+        window_->onFormRequested.disconnect(boost::bind(&UserSearchController::handleFormRequested, this, _1));
+        window_->onSearchRequested.disconnect(boost::bind(&UserSearchController::handleSearch, this, _1, _2));
+        window_->onContactSuggestionsRequested.disconnect(boost::bind(&UserSearchController::handleContactSuggestionsRequested, this, _1));
+        window_->onJIDUpdateRequested.disconnect(boost::bind(&UserSearchController::handleJIDUpdateRequested, this, _1));
+        window_->onJIDAddRequested.disconnect(boost::bind(&UserSearchController::handleJIDAddRequested, this, _1));
+        window_->onJIDEditFieldChanged.disconnect(boost::bind(&UserSearchController::handleJIDEditingFinished, this, _1));
+        delete window_;
+    }
+    presenceOracle_->onPresenceChange.disconnect(boost::bind(&UserSearchController::handlePresenceChanged, this, _1));
+    avatarManager_->onAvatarChanged.disconnect(boost::bind(&UserSearchController::handleAvatarChanged, this, _1));
+    vcardManager_->onVCardChanged.disconnect(boost::bind(&UserSearchController::handleVCardChanged, this, _1, _2));
+    uiEventStream_->onUIEvent.disconnect(boost::bind(&UserSearchController::handleUIEvent, this, _1));
 }
 
 UserSearchWindow* UserSearchController::getUserSearchWindow() {
-	initializeUserWindow();
-	assert(window_);
-	return window_;
+    initializeUserWindow();
+    assert(window_);
+    return window_;
 }
 
 void UserSearchController::setCanInitiateImpromptuMUC(bool supportsImpromptu) {
-	if (!window_) {
-		initializeUserWindow();
-	}
-	if (window_) {
-		window_->setCanStartImpromptuChats(supportsImpromptu);
-	} // Else doesn't support search
+    if (!window_) {
+        initializeUserWindow();
+    }
+    if (window_) {
+        window_->setCanStartImpromptuChats(supportsImpromptu);
+    } // Else doesn't support search
 }
 
 void UserSearchController::handleUIEvent(boost::shared_ptr<UIEvent> event) {
-	bool handle = false;
-	boost::shared_ptr<RequestAddUserDialogUIEvent> addUserRequest = boost::shared_ptr<RequestAddUserDialogUIEvent>();
-	RequestInviteToMUCUIEvent::ref inviteToMUCRequest = RequestInviteToMUCUIEvent::ref();
-	switch (type_) {
-		case AddContact:
-			if ((addUserRequest = boost::dynamic_pointer_cast<RequestAddUserDialogUIEvent>(event))) {
-				handle = true;
-			}
-			break;
-		case StartChat:
-			if (boost::dynamic_pointer_cast<RequestChatWithUserDialogUIEvent>(event)) {
-				handle = true;
-			}
-			break;
-		case InviteToChat:
-			if ((inviteToMUCRequest = boost::dynamic_pointer_cast<RequestInviteToMUCUIEvent>(event))) {
-				handle = true;
-			}
-			break;
-	}
-	if (handle) {
-		initializeUserWindow();
-		window_->show();
-		window_->addSavedServices(savedDirectories_);
-		if (addUserRequest) {
-			const std::string& name = addUserRequest->getPredefinedName();
-			const JID& jid = addUserRequest->getPredefinedJID();
-			if (!name.empty() && jid.isValid()) {
-				window_->prepopulateJIDAndName(jid, name);
-			}
-		} else if (inviteToMUCRequest) {
-			window_->setCanSupplyDescription(!inviteToMUCRequest->isImpromptu());
-			window_->setJIDs(inviteToMUCRequest->getInvites());
-			window_->setRoomJID(inviteToMUCRequest->getRoom());
-		}
-		return;
-	}
+    bool handle = false;
+    boost::shared_ptr<RequestAddUserDialogUIEvent> addUserRequest = boost::shared_ptr<RequestAddUserDialogUIEvent>();
+    RequestInviteToMUCUIEvent::ref inviteToMUCRequest = RequestInviteToMUCUIEvent::ref();
+    switch (type_) {
+        case AddContact:
+            if ((addUserRequest = boost::dynamic_pointer_cast<RequestAddUserDialogUIEvent>(event))) {
+                handle = true;
+            }
+            break;
+        case StartChat:
+            if (boost::dynamic_pointer_cast<RequestChatWithUserDialogUIEvent>(event)) {
+                handle = true;
+            }
+            break;
+        case InviteToChat:
+            if ((inviteToMUCRequest = boost::dynamic_pointer_cast<RequestInviteToMUCUIEvent>(event))) {
+                handle = true;
+            }
+            break;
+    }
+    if (handle) {
+        initializeUserWindow();
+        window_->show();
+        window_->addSavedServices(savedDirectories_);
+        if (addUserRequest) {
+            const std::string& name = addUserRequest->getPredefinedName();
+            const JID& jid = addUserRequest->getPredefinedJID();
+            if (!name.empty() && jid.isValid()) {
+                window_->prepopulateJIDAndName(jid, name);
+            }
+        } else if (inviteToMUCRequest) {
+            window_->setCanSupplyDescription(!inviteToMUCRequest->isImpromptu());
+            window_->setJIDs(inviteToMUCRequest->getInvites());
+            window_->setRoomJID(inviteToMUCRequest->getRoom());
+        }
+        return;
+    }
 }
 
 void UserSearchController::handleFormRequested(const JID& service) {
-	window_->setSearchError(false);
-	window_->setServerSupportsSearch(true);
-
-	//Abort a previous search if is active
-	endDiscoWalker();
-	delete discoWalker_;
-	discoWalker_ = new DiscoServiceWalker(service, iqRouter_);
-	discoWalker_->onServiceFound.connect(boost::bind(&UserSearchController::handleDiscoServiceFound, this, _1, _2));
-	discoWalker_->onWalkComplete.connect(boost::bind(&UserSearchController::handleDiscoWalkFinished, this));
-	discoWalker_->beginWalk();
+    window_->setSearchError(false);
+    window_->setServerSupportsSearch(true);
+
+    //Abort a previous search if is active
+    endDiscoWalker();
+    delete discoWalker_;
+    discoWalker_ = new DiscoServiceWalker(service, iqRouter_);
+    discoWalker_->onServiceFound.connect(boost::bind(&UserSearchController::handleDiscoServiceFound, this, _1, _2));
+    discoWalker_->onWalkComplete.connect(boost::bind(&UserSearchController::handleDiscoWalkFinished, this));
+    discoWalker_->beginWalk();
 }
 
 void UserSearchController::endDiscoWalker() {
-	if (discoWalker_) {
-		discoWalker_->endWalk();
-		discoWalker_->onServiceFound.disconnect(boost::bind(&UserSearchController::handleDiscoServiceFound, this, _1, _2));
-		discoWalker_->onWalkComplete.disconnect(boost::bind(&UserSearchController::handleDiscoWalkFinished, this));
-	}
+    if (discoWalker_) {
+        discoWalker_->endWalk();
+        discoWalker_->onServiceFound.disconnect(boost::bind(&UserSearchController::handleDiscoServiceFound, this, _1, _2));
+        discoWalker_->onWalkComplete.disconnect(boost::bind(&UserSearchController::handleDiscoWalkFinished, this));
+    }
 }
 
 void UserSearchController::handleDiscoServiceFound(const JID& jid, boost::shared_ptr<DiscoInfo> info) {
-	//bool isUserDirectory = false;
-	bool supports55 = false;
-	foreach (DiscoInfo::Identity identity, info->getIdentities()) {
-		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::make_shared<SearchPayload>(), iqRouter_));
-		searchRequest->onResponse.connect(boost::bind(&UserSearchController::handleFormResponse, this, _1, _2));
-		searchRequest->send();
-	}
+    //bool isUserDirectory = false;
+    bool supports55 = false;
+    foreach (DiscoInfo::Identity identity, info->getIdentities()) {
+        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::make_shared<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);
+    if (error || !fields) {
+        window_->setServerSupportsSearch(false);
+        return;
+    }
+    window_->setSearchFields(fields);
 }
 
 void UserSearchController::handleSearch(boost::shared_ptr<SearchPayload> fields, const JID& jid) {
-	addToSavedDirectories(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();
+    addToSavedDirectories(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;
-
-	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);
-	}
+    if (error || !resultsPayload) {
+        window_->setSearchError(true);
+        return;
+    }
+
+    std::vector<UserSearchResult> results;
+
+    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);
+    }
 }
 
 void UserSearchController::handleNameSuggestionRequest(const JID &jid) {
-	suggestionsJID_= jid;
-	VCard::ref vcard = vcardManager_->getVCardAndRequestWhenNeeded(jid);
-	if (vcard) {
-		handleVCardChanged(jid, vcard);
-	}
+    suggestionsJID_= jid;
+    VCard::ref vcard = vcardManager_->getVCardAndRequestWhenNeeded(jid);
+    if (vcard) {
+        handleVCardChanged(jid, vcard);
+    }
 }
 
 void UserSearchController::handleJIDEditingFinished(const JID& jid) {
-	if (jid.isValid()) {
-		if (rosterController_->getItem(jid)) {
-			window_->setWarning(QT_TRANSLATE_NOOP("", "This contact is already on your contact list."));
-		}
-		else if (jid.getNode().empty()) {
-			window_->setWarning(QT_TRANSLATE_NOOP("", "Part of the address you have entered is missing. An address has a structure of 'user@example.com'."));
-		}
-		else {
-			window_->setWarning(boost::optional<std::string>());
-		}
-	}
-	else {
-		window_->setWarning(QT_TRANSLATE_NOOP("", "The address you have entered is invalid."));
-	}
+    if (jid.isValid()) {
+        if (rosterController_->getItem(jid)) {
+            window_->setWarning(QT_TRANSLATE_NOOP("", "This contact is already on your contact list."));
+        }
+        else if (jid.getNode().empty()) {
+            window_->setWarning(QT_TRANSLATE_NOOP("", "Part of the address you have entered is missing. An address has a structure of 'user@example.com'."));
+        }
+        else {
+            window_->setWarning(boost::optional<std::string>());
+        }
+    }
+    else {
+        window_->setWarning(QT_TRANSLATE_NOOP("", "The address you have entered is invalid."));
+    }
 }
 
 void UserSearchController::handleContactSuggestionsRequested(std::string text) {
-	const std::vector<JID> existingJIDs = window_->getJIDs();
-	std::vector<Contact::ref> suggestions = contactSuggester_->getSuggestions(text, false);
-	/* do not suggest contacts that have already been added to the chat list */
-	std::vector<Contact::ref>::iterator i = suggestions.begin();
-	while (i != suggestions.end()) {
-		bool found = false;
-		foreach (const JID& jid, existingJIDs) {
-			if ((*i)->jid == jid) {
-				found = true;
-				break;
-			}
-		}
-
-		// remove contact suggestions which are already on the contact list in add-contact-mode
-		if (type_ == AddContact) {
-			if (!found && !!rosterController_->getItem((*i)->jid)) {
-				found = true;
-			}
-		}
-
-		if (found) {
-			i = suggestions.erase(i);
-		} else {
-			i++;
-		}
-	}
-	window_->setContactSuggestions(suggestions);
+    const std::vector<JID> existingJIDs = window_->getJIDs();
+    std::vector<Contact::ref> suggestions = contactSuggester_->getSuggestions(text, false);
+    /* do not suggest contacts that have already been added to the chat list */
+    std::vector<Contact::ref>::iterator i = suggestions.begin();
+    while (i != suggestions.end()) {
+        bool found = false;
+        foreach (const JID& jid, existingJIDs) {
+            if ((*i)->jid == jid) {
+                found = true;
+                break;
+            }
+        }
+
+        // remove contact suggestions which are already on the contact list in add-contact-mode
+        if (type_ == AddContact) {
+            if (!found && !!rosterController_->getItem((*i)->jid)) {
+                found = true;
+            }
+        }
+
+        if (found) {
+            i = suggestions.erase(i);
+        } else {
+            i++;
+        }
+    }
+    window_->setContactSuggestions(suggestions);
 }
 
 void UserSearchController::handleVCardChanged(const JID& jid, VCard::ref vcard) {
-	if (jid == suggestionsJID_) {
-		window_->setNameSuggestions(ContactEditController::nameSuggestionsFromVCard(vcard));
-		suggestionsJID_ = JID();
-	}
-	handleJIDUpdateRequested(std::vector<JID>(1, jid));
+    if (jid == suggestionsJID_) {
+        window_->setNameSuggestions(ContactEditController::nameSuggestionsFromVCard(vcard));
+        suggestionsJID_ = JID();
+    }
+    handleJIDUpdateRequested(std::vector<JID>(1, jid));
 }
 
 void UserSearchController::handleAvatarChanged(const JID& jid) {
-	handleJIDUpdateRequested(std::vector<JID>(1, jid));
+    handleJIDUpdateRequested(std::vector<JID>(1, jid));
 }
 
 void UserSearchController::handlePresenceChanged(Presence::ref presence) {
-	handleJIDUpdateRequested(std::vector<JID>(1, presence->getFrom().toBare()));
+    handleJIDUpdateRequested(std::vector<JID>(1, presence->getFrom().toBare()));
 }
 
 void UserSearchController::handleJIDUpdateRequested(const std::vector<JID>& jids) {
-	if (window_) {
-		std::vector<Contact::ref> updates;
-		foreach(const JID& jid, jids) {
-			updates.push_back(convertJIDtoContact(jid));
-		}
-		window_->updateContacts(updates);
-	}
+    if (window_) {
+        std::vector<Contact::ref> updates;
+        foreach(const JID& jid, jids) {
+            updates.push_back(convertJIDtoContact(jid));
+        }
+        window_->updateContacts(updates);
+    }
 }
 
 void UserSearchController::handleJIDAddRequested(const std::vector<JID>& jids) {
-	std::vector<Contact::ref> contacts;
-	foreach(const JID& jid, jids) {
-		contacts.push_back(convertJIDtoContact(jid));
-	}
-	window_->addContacts(contacts);
+    std::vector<Contact::ref> contacts;
+    foreach(const JID& jid, jids) {
+        contacts.push_back(convertJIDtoContact(jid));
+    }
+    window_->addContacts(contacts);
 }
 
 Contact::ref UserSearchController::convertJIDtoContact(const JID& jid) {
-	Contact::ref contact = boost::make_shared<Contact>();
-	contact->jid = jid;
-
-	// name lookup
-	boost::optional<XMPPRosterItem> rosterItem = rosterController_->getItem(jid);
-	if (rosterItem && !rosterItem->getName().empty()) {
-		contact->name = rosterItem->getName();
-	} else {
-		VCard::ref vcard = vcardManager_->getVCard(jid);
-		if (vcard && !vcard->getFullName().empty()) {
-			contact->name = vcard->getFullName();
-		} else {
-			contact->name = jid.toString();
-		}
-	}
-
-	// presence lookup
-	Presence::ref presence = presenceOracle_->getAccountPresence(jid);
-	if (presence) {
-		contact->statusType = presence->getShow();
-	} else {
-		contact->statusType = StatusShow::None;
-	}
-
-	// avatar lookup
-	contact->avatarPath = avatarManager_->getAvatarPath(jid);
-	return contact;
+    Contact::ref contact = boost::make_shared<Contact>();
+    contact->jid = jid;
+
+    // name lookup
+    boost::optional<XMPPRosterItem> rosterItem = rosterController_->getItem(jid);
+    if (rosterItem && !rosterItem->getName().empty()) {
+        contact->name = rosterItem->getName();
+    } else {
+        VCard::ref vcard = vcardManager_->getVCard(jid);
+        if (vcard && !vcard->getFullName().empty()) {
+            contact->name = vcard->getFullName();
+        } else {
+            contact->name = jid.toString();
+        }
+    }
+
+    // presence lookup
+    Presence::ref presence = presenceOracle_->getAccountPresence(jid);
+    if (presence) {
+        contact->statusType = presence->getShow();
+    } else {
+        contact->statusType = StatusShow::None;
+    }
+
+    // avatar lookup
+    contact->avatarPath = avatarManager_->getAvatarPath(jid);
+    return contact;
 }
 
 void UserSearchController::handleDiscoWalkFinished() {
-	window_->setServerSupportsSearch(false);
-	endDiscoWalker();
+    window_->setServerSupportsSearch(false);
+    endDiscoWalker();
 }
 
 void UserSearchController::initializeUserWindow() {
-	if (!window_) {
-		UserSearchWindow::Type windowType = UserSearchWindow::AddContact;
-		switch(type_) {
-			case AddContact:
-				windowType = UserSearchWindow::AddContact;
-				break;
-			case StartChat:
-				windowType = UserSearchWindow::ChatToContact;
-				break;
-			case InviteToChat:
-				windowType = UserSearchWindow::InviteToChat;
-				break;
-		}
-
-		window_ = factory_->createUserSearchWindow(windowType, uiEventStream_, rosterController_->getGroups());
-		if (!window_) {
-			// UI Doesn't support user search
-			return;
-		}
-		window_->onNameSuggestionRequested.connect(boost::bind(&UserSearchController::handleNameSuggestionRequest, this, _1));
-		window_->onFormRequested.connect(boost::bind(&UserSearchController::handleFormRequested, this, _1));
-		window_->onSearchRequested.connect(boost::bind(&UserSearchController::handleSearch, this, _1, _2));
-		window_->onContactSuggestionsRequested.connect(boost::bind(&UserSearchController::handleContactSuggestionsRequested, this, _1));
-		window_->onJIDUpdateRequested.connect(boost::bind(&UserSearchController::handleJIDUpdateRequested, this, _1));
-		window_->onJIDAddRequested.connect(boost::bind(&UserSearchController::handleJIDAddRequested, this, _1));
-		window_->onJIDEditFieldChanged.connect(boost::bind(&UserSearchController::handleJIDEditingFinished, this, _1));
-		window_->setSelectedService(JID(jid_.getDomain()));
-		window_->clear();
-	}
+    if (!window_) {
+        UserSearchWindow::Type windowType = UserSearchWindow::AddContact;
+        switch(type_) {
+            case AddContact:
+                windowType = UserSearchWindow::AddContact;
+                break;
+            case StartChat:
+                windowType = UserSearchWindow::ChatToContact;
+                break;
+            case InviteToChat:
+                windowType = UserSearchWindow::InviteToChat;
+                break;
+        }
+
+        window_ = factory_->createUserSearchWindow(windowType, uiEventStream_, rosterController_->getGroups());
+        if (!window_) {
+            // UI Doesn't support user search
+            return;
+        }
+        window_->onNameSuggestionRequested.connect(boost::bind(&UserSearchController::handleNameSuggestionRequest, this, _1));
+        window_->onFormRequested.connect(boost::bind(&UserSearchController::handleFormRequested, this, _1));
+        window_->onSearchRequested.connect(boost::bind(&UserSearchController::handleSearch, this, _1, _2));
+        window_->onContactSuggestionsRequested.connect(boost::bind(&UserSearchController::handleContactSuggestionsRequested, this, _1));
+        window_->onJIDUpdateRequested.connect(boost::bind(&UserSearchController::handleJIDUpdateRequested, this, _1));
+        window_->onJIDAddRequested.connect(boost::bind(&UserSearchController::handleJIDAddRequested, this, _1));
+        window_->onJIDEditFieldChanged.connect(boost::bind(&UserSearchController::handleJIDEditingFinished, this, _1));
+        window_->setSelectedService(JID(jid_.getDomain()));
+        window_->clear();
+    }
 }
 
 void UserSearchController::loadSavedDirectories() {
-	savedDirectories_.clear();
-	foreach (std::string stringItem, String::split(settings_->getStringSetting(SEARCHED_DIRECTORIES), '\n')) {
-		if(!stringItem.empty()) {
-			savedDirectories_.push_back(JID(stringItem));
-		}
-	}
+    savedDirectories_.clear();
+    foreach (std::string stringItem, String::split(settings_->getStringSetting(SEARCHED_DIRECTORIES), '\n')) {
+        if(!stringItem.empty()) {
+            savedDirectories_.push_back(JID(stringItem));
+        }
+    }
 }
 
 void UserSearchController::addToSavedDirectories(const JID& jid) {
-	if (!jid.isValid()) {
-		return;
-	}
-
-	savedDirectories_.erase(std::remove(savedDirectories_.begin(), savedDirectories_.end(), jid), savedDirectories_.end());
-	savedDirectories_.insert(savedDirectories_.begin(), jid);
-
-	std::string collapsed;
-	int i = 0;
-	foreach (JID jidItem, savedDirectories_) {
-		if (i >= 15) {
-			break;
-		}
-		if (!collapsed.empty()) {
-			collapsed += "\n";
-		}
-		collapsed += jidItem.toString();
-		++i;
-	}
-	settings_->storeString(SEARCHED_DIRECTORIES, collapsed);
-	window_->addSavedServices(savedDirectories_);
+    if (!jid.isValid()) {
+        return;
+    }
+
+    savedDirectories_.erase(std::remove(savedDirectories_.begin(), savedDirectories_.end(), jid), savedDirectories_.end());
+    savedDirectories_.insert(savedDirectories_.begin(), jid);
+
+    std::string collapsed;
+    int i = 0;
+    foreach (JID jidItem, savedDirectories_) {
+        if (i >= 15) {
+            break;
+        }
+        if (!collapsed.empty()) {
+            collapsed += "\n";
+        }
+        collapsed += jidItem.toString();
+        ++i;
+    }
+    settings_->storeString(SEARCHED_DIRECTORIES, collapsed);
+    window_->addSavedServices(savedDirectories_);
 }
 
 }