From 61fed862adef959508558161298e6d11e5cc0903 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Fri, 20 Aug 2010 11:05:20 +0100
Subject: Only add one vcard and caps element to each presence stanza.

Resolves: #524

diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 4e72cc6..5502640 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -285,9 +285,9 @@ void MainController::sendPresence(boost::shared_ptr<Presence> presence) {
 
 	// Add information and send
 	if (!vCardPhotoHash_.isEmpty()) {
-		presence->addPayload(boost::shared_ptr<VCardUpdate>(new VCardUpdate(vCardPhotoHash_)));
+		presence->updatePayload(boost::shared_ptr<VCardUpdate>(new VCardUpdate(vCardPhotoHash_)));
 	}
-	presence->addPayload(capsInfo_);
+	presence->updatePayload(capsInfo_);
 	presenceSender_->sendPresence(presence);
 	if (presence->getType() == Presence::Unavailable) {
 		logout();
-- 
cgit v0.10.2-6-g49f6