← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kopete/trusty

« back to all changes in this revision

Viewing changes to protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.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-core/securestream.cpp
170
170
                connect(p.tlsHandler, SIGNAL(success()), SLOT(tlsHandler_success()));
171
171
                connect(p.tlsHandler, SIGNAL(fail()), SLOT(tlsHandler_fail()));
172
172
                connect(p.tlsHandler, SIGNAL(closed()), SLOT(tlsHandler_closed()));
173
 
                connect(p.tlsHandler, SIGNAL(readyRead(const QByteArray &)), SLOT(tlsHandler_readyRead(const QByteArray &)));
174
 
                connect(p.tlsHandler, SIGNAL(readyReadOutgoing(const QByteArray &, int)), SLOT(tlsHandler_readyReadOutgoing(const QByteArray &, int)));
 
173
                connect(p.tlsHandler, SIGNAL(readyRead(QByteArray)), SLOT(tlsHandler_readyRead(QByteArray)));
 
174
                connect(p.tlsHandler, SIGNAL(readyReadOutgoing(QByteArray,int)), SLOT(tlsHandler_readyReadOutgoing(QByteArray,int)));
175
175
        }
176
176
#endif
177
177
 
407
407
void SecureStream::linkLayer(QObject *s)
408
408
{
409
409
        connect(s, SIGNAL(tlsHandshaken()), SLOT(layer_tlsHandshaken()));
410
 
        connect(s, SIGNAL(tlsClosed(const QByteArray &)), SLOT(layer_tlsClosed(const QByteArray &)));
411
 
        connect(s, SIGNAL(readyRead(const QByteArray &)), SLOT(layer_readyRead(const QByteArray &)));
412
 
        connect(s, SIGNAL(needWrite(const QByteArray &)), SLOT(layer_needWrite(const QByteArray &)));
 
410
        connect(s, SIGNAL(tlsClosed(QByteArray)), SLOT(layer_tlsClosed(QByteArray)));
 
411
        connect(s, SIGNAL(readyRead(QByteArray)), SLOT(layer_readyRead(QByteArray)));
 
412
        connect(s, SIGNAL(needWrite(QByteArray)), SLOT(layer_needWrite(QByteArray)));
413
413
        connect(s, SIGNAL(error(int)), SLOT(layer_error(int)));
414
414
}
415
415