Skip to content

Commit

Permalink
Fixed: choose filetransfer transport by priority (thanks Dealer_WeARE)
Browse files Browse the repository at this point in the history
git-svn-id: http://delta.affinix.com/svn/trunk/iris@813 ac7a513c-5e3a-0410-af42-968c3ac6e7dc
  • Loading branch information
Sergey I committed Nov 11, 2011
1 parent cd54d26 commit c25194a
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/xmpp/xmpp-im/filetransfer.cpp
Expand Up @@ -438,11 +438,13 @@ void FileTransferManager::setDisabled(const QString &ns, bool state)
void FileTransferManager::pft_incoming(const FTRequest &req)
{
QString streamType;
foreach (const QString &ns, req.streamTypes) {
BytestreamManager *manager = streamManager(ns);
if (manager && manager->isAcceptableSID(req.from, req.id)) {
streamType = ns;
break;
foreach(const QString& ns, d->streamPriority) {
if(req.streamTypes.contains(ns)) {
BytestreamManager *manager = streamManager(ns);
if (manager && manager->isAcceptableSID(req.from, req.id)) {
streamType = ns;
break;
}
}
}

Expand Down

0 comments on commit c25194a

Please sign in to comment.