Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-08-28 10:01:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-28 10:01:54 (GMT) |
| commit | b1a9a1b61ebce0f64d656006a85607c8c8491f4a (patch) | |
| tree | a3157084893c6fa0f41f85a4de1b36f280334c02 /Swiften/Avatars/UnitTest | |
| parent | 66f820c2c7e2d7c6d883c995bf7b2da37aa963c7 (diff) | |
| parent | 2faca4242e4de2568eb917df83fd1b9c21f33897 (diff) | |
| download | swift-b1a9a1b61ebce0f64d656006a85607c8c8491f4a.zip swift-b1a9a1b61ebce0f64d656006a85607c8c8491f4a.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Remove relaxation of not checking JIDs if the IQRouter's JID isn't set.
Fixed Request::isAccountJID().
Check sender on incoming IQ responses.
Diffstat (limited to 'Swiften/Avatars/UnitTest')
| -rw-r--r-- | Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp index 0c2633a..bd96b2d 100644 --- a/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp +++ b/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp @@ -129,7 +129,7 @@ class VCardAvatarManagerTest : public CppUnit::TestFixture { void sendVCardResult() { VCard::ref vcard(new VCard()); vcard->setFullName("Foo Bar"); - stanzaChannel->onIQReceived(IQ::createResult(JID("baz@fum.com/dum"), stanzaChannel->sentStanzas[0]->getID(), vcard)); + stanzaChannel->onIQReceived(IQ::createResult(JID("baz@fum.com/dum"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID(), vcard)); } private: diff --git a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp index e0fd080..821412b 100644 --- a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp +++ b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp @@ -167,7 +167,7 @@ class VCardUpdateAvatarManagerTest : public CppUnit::TestFixture { if (!avatar.empty()) { vcard->setPhoto(avatar); } - return IQ::createResult(JID("baz@fum.com"), stanzaChannel->sentStanzas[0]->getID(), vcard); + return IQ::createResult(JID("baz@fum.com"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID(), vcard); } void handleAvatarChanged(const JID& jid) { |