1 files changed, 11 insertions, 11 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index 7844c1b..8503609 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -183,113 +183,113 @@ void UserSearchController::handleSearchResponse(boost::shared_ptr<SearchPayload>
 		}
 		window_->setResults(results);
 	}
 }
 
 void UserSearchController::handleNameSuggestionRequest(const JID &jid) {
 	suggestionsJID_= jid;
 	VCard::ref vcard = vcardManager_->getVCardAndRequestWhenNeeded(jid);
 	if (vcard) {
 		handleVCardChanged(jid, vcard);
 	}
 }
 
 void UserSearchController::handleContactSuggestionsRequested(std::string text) {
 	window_->setContactSuggestions(contactSuggester_->getSuggestions(text));
 }
 
 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));
 }
 
 void UserSearchController::handleAvatarChanged(const JID& jid) {
 	handleJIDUpdateRequested(std::vector<JID>(1, jid));
 }
 
 void UserSearchController::handlePresenceChanged(Presence::ref presence) {
 	handleJIDUpdateRequested(std::vector<JID>(1, presence->getFrom().toBare()));
 }
 
 void UserSearchController::handleJIDUpdateRequested(const std::vector<JID>& jids) {
 	if (window_) {
-		std::vector<Contact> updates;
+		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> contacts;
+	std::vector<Contact::ref> contacts;
 	foreach(const JID& jid, jids) {
 		contacts.push_back(convertJIDtoContact(jid));
 	}
 	window_->addContacts(contacts);
 }
 
-Contact UserSearchController::convertJIDtoContact(const JID& jid) {
-	Contact contact;
-	contact.jid = jid;
+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();
+		contact->name = rosterItem->getName();
 	} else {
 		VCard::ref vcard = vcardManager_->getVCard(jid);
 		if (vcard && !vcard->getFullName().empty()) {
-			contact.name = vcard->getFullName();
+			contact->name = vcard->getFullName();
 		} else {
-			contact.name = jid.toString();
+			contact->name = jid.toString();
 		}
 	}
 
 	// presence lookup
 	Presence::ref presence = presenceOracle_->getHighestPriorityPresence(jid);
 	if (presence) {
-		contact.statusType = presence->getShow();
+		contact->statusType = presence->getShow();
 	} else {
-		contact.statusType = StatusShow::None;
+		contact->statusType = StatusShow::None;
 	}
 
 	// avatar lookup
-	contact.avatarPath = avatarManager_->getAvatarPath(jid);
+	contact->avatarPath = avatarManager_->getAvatarPath(jid);
 	return contact;
 }
 
 void UserSearchController::handleDiscoWalkFinished() {
 	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());
 		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_->setSelectedService(JID(jid_.getDomain()));
 		window_->clear();
 	}
 }