← 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-im/client.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/client.cpp
51
51
//!  {
52
52
//!    client = new Client;
53
53
//!    connect(client, SIGNAL(handshaken()), SLOT(clientHandshaken()));
54
 
//!    connect(client, SIGNAL(authFinished(bool, int, const QString &)), SLOT(authFinished(bool, int, const QString &)));
 
54
//!    connect(client, SIGNAL(authFinished(bool,int,QString)), SLOT(authFinished(bool,int,QString)));
55
55
//!    client->connectToHost("jabber.org");
56
56
//!  }
57
57
//!
129
129
        int id_seed;
130
130
        Task *root;
131
131
        QString host, user, pass, resource;
132
 
        QString osname, tzname, clientName, clientVersion, capsNode, capsVersion, capsExt, capsHash;
 
132
        QString osname, tzname, clientName, clientVersion, capsNode, capsVersion, capsExt;
133
133
        DiscoItem::Identity identity;
134
134
        Features features;
135
135
        QMap<QString,Features> extension_features;
161
161
        d->capsNode = "";
162
162
        d->capsVersion = "";
163
163
        d->capsExt = "";
164
 
        d->capsHash = "";
165
164
 
166
165
        d->id_seed = 0xaaaa;
167
166
        d->root = new Task(this, true);
194
193
        //connect(d->stream, SIGNAL(connected()), SLOT(streamConnected()));
195
194
        //connect(d->stream, SIGNAL(handshaken()), SLOT(streamHandshaken()));
196
195
        connect(d->stream, SIGNAL(error(int)), SLOT(streamError(int)));
197
 
        //connect(d->stream, SIGNAL(sslCertificateReady(const QSSLCert &)), SLOT(streamSSLCertificateReady(const QSSLCert &)));
 
196
        //connect(d->stream, SIGNAL(sslCertificateReady(QSSLCert)), SLOT(streamSSLCertificateReady(QSSLCert)));
198
197
        connect(d->stream, SIGNAL(readyRead()), SLOT(streamReadyRead()));
199
198
        //connect(d->stream, SIGNAL(closeFinished()), SLOT(streamCloseFinished()));
200
 
        connect(d->stream, SIGNAL(incomingXml(const QString &)), SLOT(streamIncomingXml(const QString &)));
201
 
        connect(d->stream, SIGNAL(outgoingXml(const QString &)), SLOT(streamOutgoingXml(const QString &)));
 
199
        connect(d->stream, SIGNAL(incomingXml(QString)), SLOT(streamIncomingXml(QString)));
 
200
        connect(d->stream, SIGNAL(outgoingXml(QString)), SLOT(streamOutgoingXml(QString)));
202
201
 
203
202
        d->stream->connectToServer(j, auth);
204
203
}
216
215
        d->resourceList += Resource(resource(), stat);
217
216
 
218
217
        JT_PushPresence *pp = new JT_PushPresence(rootTask());
219
 
        connect(pp, SIGNAL(subscription(const Jid &, const QString &, const QString&)), SLOT(ppSubscription(const Jid &, const QString &, const QString&)));
220
 
        connect(pp, SIGNAL(presence(const Jid &, const Status &)), SLOT(ppPresence(const Jid &, const Status &)));
 
218
        connect(pp, SIGNAL(subscription(Jid,QString,QString)), SLOT(ppSubscription(Jid,QString,QString)));
 
219
        connect(pp, SIGNAL(presence(Jid,Status)), SLOT(ppPresence(Jid,Status)));
221
220
 
222
221
        JT_PushMessage *pm = new JT_PushMessage(rootTask());
223
 
        connect(pm, SIGNAL(message(const Message &)), SLOT(pmMessage(const Message &)));
 
222
        connect(pm, SIGNAL(message(Message)), SLOT(pmMessage(Message)));
224
223
 
225
224
        JT_PushRoster *pr = new JT_PushRoster(rootTask());
226
 
        connect(pr, SIGNAL(roster(const Roster &)), SLOT(prRoster(const Roster &)));
 
225
        connect(pr, SIGNAL(roster(Roster)), SLOT(prRoster(Roster)));
227
226
 
228
227
        new JT_ServInfo(rootTask());
229
228
        new JT_PongServer(rootTask());
301
300
        }
302
301
}
303
302
 
304
 
bool Client::groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString& password, int maxchars, int maxstanzas, int seconds, const Status& _s)
 
303
bool Client::groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString& password, int maxchars, int maxstanzas, int seconds, const QDateTime &since, const Status& _s)
305
304
{
306
305
        Jid jid(room + "@" + host + "/" + nick);
307
306
        for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) {
327
326
        JT_Presence *j = new JT_Presence(rootTask());
328
327
        Status s = _s;
329
328
        s.setMUC();
330
 
        s.setMUCHistory(maxchars,maxstanzas,seconds);
 
329
        s.setMUCHistory(maxchars, maxstanzas, seconds, since);
331
330
        if (!password.isEmpty()) {
332
331
                s.setMUCPassword(password);
333
332
        }
1065
1064
        return d->capsExt;
1066
1065
}
1067
1066
 
1068
 
QString Client::capsHash() const
1069
 
{
1070
 
        return d->capsHash;
1071
 
}
1072
 
 
1073
1067
void Client::setOSName(const QString &name)
1074
1068
{
1075
1069
        d->osname = name;
1102
1096
        d->capsVersion = s;
1103
1097
}
1104
1098
 
1105
 
void Client::setCapsHash(const QString &s)
1106
 
{
1107
 
        d->capsHash = s;
1108
 
}
1109
 
 
1110
1099
DiscoItem::Identity Client::identity()
1111
1100
{
1112
1101
        return d->identity;