← Back to branch summary

~ubuntu-branches/ubuntu/saucy/quassel/saucy-proposed

« back to all changes in this revision

Viewing changes to src/core/coresession.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-02-17 12:49:50 UTC
  • mto: This revision was merged to the branch mainline in revision 59.
  • Revision ID: james.westby@ubuntu.com-20100217124950-v9hajw5d2xa6fszn
Tags: upstream-0.6~beta1
Import upstream version 0.6~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/coresession.cpp
62
62
    _ignoreListManager(this)
63
63
{
64
64
  SignalProxy *p = signalProxy();
 
65
  p->setHeartBeatInterval(30);
 
66
  p->setMaxHeartBeatCount(60); // 30 mins until we throw a dead socket out
 
67
 
65
68
  connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *)));
66
69
 
67
70
  connect(p, SIGNAL(connected()), this, SLOT(clientsConnected()));
130
133
    QList<NetworkInfo>::iterator networkIter = networkInfos.begin();
131
134
    while(networkIter != networkInfos.end()) {
132
135
      if(networkIter->identity == id) {
133
 
        networkIter->identity = newId;
134
 
        Core::updateNetwork(user(), *networkIter);
135
 
        networkIter = networkInfos.erase(networkIter);
 
136
        networkIter->identity = newId;
 
137
        Core::updateNetwork(user(), *networkIter);
 
138
        networkIter = networkInfos.erase(networkIter);
136
139
      } else {
137
 
        networkIter++;
 
140
        networkIter++;
138
141
      }
139
142
    }
140
143
    s.removeIdentity(id);
263
266
    for(int i = 0; i < _messageQueue.count(); i++) {
264
267
      const RawMessage &rawMsg = _messageQueue.at(i);
265
268
      if(bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
266
 
        bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
 
269
        bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
267
270
      } else {
268
 
        bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
269
 
        bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
 
271
        bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
 
272
        bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
270
273
      }
271
274
 
272
275
      Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
290
293
QVariant CoreSession::sessionState() {
291
294
  QVariantMap v;
292
295
 
 
296
  v["CoreFeatures"] = (int)Quassel::features();
 
297
 
293
298
  QVariantList bufs;
294
299
  foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
295
300
  v["BufferInfos"] = bufs;
497
502
 
498
503
    if(identity->detachAwayEnabled() && !me->isAway()) {
499
504
      if(!identity->detachAwayReason().isEmpty())
500
 
        awayReason = identity->detachAwayReason();
 
505
        awayReason = identity->detachAwayReason();
501
506
      net->setAutoAwayActive(true);
502
507
      net->userInputHandler()->handleAway(BufferInfo(), awayReason);
503
508
    }