← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kopete/utopic-proposed

« back to all changes in this revision

Viewing changes to protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2013-11-23 17:46:40 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20131123174640-gz1zjv1xqh81bi2h
Tags: 4:4.11.80-0ubuntu1
* New upstream beta release
* Bump build dependency to libotr5-dev
* Update symbols
* Update install files
* Drop new_linphone.diff, not required anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.cpp
369
369
{
370
370
        d = new Private;
371
371
        d->client = parent;
372
 
        
 
372
 
373
373
        d->ibb = new JT_IBB(d->client->rootTask(), true);
374
374
        connect(d->ibb,
375
 
                        SIGNAL(incomingRequest(const Jid &, const QString &,
376
 
                                                                   const QString &, int, const QString &)),
377
 
                        SLOT(ibb_incomingRequest(const Jid &, const QString &,
378
 
                                                                         const QString &, int,
379
 
                                                                         const QString &)));
380
 
        connect(d->ibb,
381
 
                        SIGNAL(incomingData(const Jid &, const QString &, const IBBData &, Stanza::Kind)),
382
 
                        SLOT(takeIncomingData(const Jid &, const QString &, const IBBData &, Stanza::Kind)));
383
 
        connect(d->ibb,
384
 
                        SIGNAL(closeRequest(const Jid &, const QString &, const QString &)),
385
 
                        SLOT(ibb_closeRequest(const Jid &, const QString &, const QString &)));
 
375
                        SIGNAL(incomingRequest(Jid,QString,QString,int,QString)),
 
376
                        SLOT(ibb_incomingRequest(Jid,QString,QString,int,QString)));
 
377
        connect(d->ibb,
 
378
                        SIGNAL(incomingData(Jid,QString,IBBData,Stanza::Kind)),
 
379
                        SLOT(takeIncomingData(Jid,QString,IBBData,Stanza::Kind)));
 
380
        connect(d->ibb,
 
381
                        SIGNAL(closeRequest(Jid,QString,QString)),
 
382
                        SLOT(ibb_closeRequest(Jid,QString,QString)));
386
383
}
387
384
 
388
385
IBBManager::~IBBManager()
590
587
                if(e.tagName() != "iq" || e.attribute("type") != "set")
591
588
                        return false;
592
589
 
593
 
                bool found;
594
590
                QString id = e.attribute("id");
595
591
                QString from = e.attribute("from");
596
 
                QDomElement openEl = findSubTag(e, "open", &found);
597
 
                if (found && openEl.attribute("xmlns") == IBB_NS) {
 
592
                QDomElement openEl = e.firstChildElement("open");
 
593
                if (!openEl.isNull() && openEl.attribute("xmlns") == IBB_NS) {
598
594
                        emit incomingRequest(Jid(from), id,
599
595
                                                        openEl.attribute("sid"),
600
596
                                                        openEl.attribute("block-size").toInt(),
601
597
                                                        openEl.attribute("stanza"));
602
598
                        return true;
603
599
                }
604
 
                QDomElement dataEl = findSubTag(e, "data", &found);
605
 
                if (found && dataEl.attribute("xmlns") == IBB_NS) {
 
600
                QDomElement dataEl = e.firstChildElement("data");
 
601
                if (!dataEl.isNull() && dataEl.attribute("xmlns") == IBB_NS) {
606
602
                        IBBData data;
607
603
                        emit incomingData(Jid(from), id, data.fromXml(dataEl), Stanza::IQ);
608
604
                        return true;
609
605
                }
610
 
                QDomElement closeEl = findSubTag(e, "close", &found);
611
 
                if (found && closeEl.attribute("xmlns") == IBB_NS) {
 
606
                QDomElement closeEl = e.firstChildElement("close");
 
607
                if (!closeEl.isNull() && closeEl.attribute("xmlns") == IBB_NS) {
612
608
                        emit closeRequest(Jid(from), id, closeEl.attribute("sid"));
613
609
                        return true;
614
610
                }