Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-29 20:29:29 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-29 20:29:29 (GMT) |
| commit | 78ae057c543f4e272332430981eecd06850fbd96 (patch) | |
| tree | acfcdd27a7dc61967744f22f49b6a0be42e10070 /Swiften/FileTransfer/FileTransferManagerImpl.cpp | |
| parent | 0f752eb381b44182e048c39e621fba552c2179f0 (diff) | |
| download | swift-78ae057c543f4e272332430981eecd06850fbd96.zip swift-78ae057c543f4e272332430981eecd06850fbd96.tar.bz2 | |
Fixed check for F/T support used for enabling the "Send File" menu.
It was only checking for IBB, whereas it should have checked for IBB or
S5B.
Diffstat (limited to 'Swiften/FileTransfer/FileTransferManagerImpl.cpp')
| -rw-r--r-- | Swiften/FileTransfer/FileTransferManagerImpl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp index 1bad9fb..445c7f0 100644 --- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp +++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp @@ -81,8 +81,7 @@ boost::optional<JID> FileTransferManagerImpl::highestPriorityJIDSupportingFileTr if (pres->getPriority() > priority) { // look up caps from the jid DiscoInfo::ref info = capsProvider->getCaps(pres->getFrom()); - if (info && info->hasFeature(DiscoInfo::JingleFeature) && info->hasFeature(DiscoInfo::JingleFTFeature) && - info->hasFeature(DiscoInfo::JingleTransportsIBBFeature)) { + if (info && info->hasFeature(DiscoInfo::JingleFeature) && info->hasFeature(DiscoInfo::JingleFTFeature) && (info->hasFeature(DiscoInfo::JingleTransportsIBBFeature) || info->hasFeature(DiscoInfo::JingleTransportsS5BFeature))) { priority = pres->getPriority(); fullReceipientJID = pres->getFrom(); |