diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-09-20 14:34:10 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-09-20 14:34:10 +0000 |
| commit | 979c12b69118523cd9acce6c262d6e9bd9ff7718 (patch) | |
| tree | 591feadb9901678be975298051c72f33ac72d06a /src/QXmppClient.cpp | |
| parent | 60c1d709938d662702907ce316ea8a30c24e2e7a (diff) | |
| download | qxmpp-979c12b69118523cd9acce6c262d6e9bd9ff7718.tar.gz | |
Make legacy QXmppClient::discoveryIqReceived() signal actually work
by relaying QXmppDiscoveryManager's signals. The old code in
QXmppOutgoingClient is no longer reached.
Diffstat (limited to 'src/QXmppClient.cpp')
| -rw-r--r-- | src/QXmppClient.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp index e0e2386f..ab845a08 100644 --- a/src/QXmppClient.cpp +++ b/src/QXmppClient.cpp @@ -164,10 +164,6 @@ QXmppClient::QXmppClient(QObject *parent) SIGNAL(iqReceived(const QXmppIq&))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(discoveryIqReceived(const QXmppDiscoveryIq&)), this, - SIGNAL(discoveryIqReceived(const QXmppDiscoveryIq&))); - Q_ASSERT(check); - check = connect(d->stream, SIGNAL(disconnected()), this, SIGNAL(disconnected())); Q_ASSERT(check); @@ -220,7 +216,18 @@ QXmppClient::QXmppClient(QObject *parent) addExtension(d->versionManager); addExtension(new QXmppEntityTimeManager()); - addExtension(new QXmppDiscoveryManager()); + + QXmppDiscoveryManager *discoveryManager = new QXmppDiscoveryManager; + addExtension(discoveryManager); + + // obsolete signal + check = connect(discoveryManager, SIGNAL(infoReceived(QXmppDiscoveryIq)), + this, SIGNAL(discoveryIqReceived(QXmppDiscoveryIq))); + Q_ASSERT(check); + + check = connect(discoveryManager, SIGNAL(itemsReceived(QXmppDiscoveryIq)), + this, SIGNAL(discoveryIqReceived(QXmppDiscoveryIq))); + Q_ASSERT(check); } /// Destructor, destroys the QXmppClient object. |