/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
_coreInfo(this),
scriptEngine(new QScriptEngine(this))
{
-
SignalProxy *p = signalProxy();
connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *)));
p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
- p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
+ p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &, const QStringList &)), this, SLOT(createNetwork(const NetworkInfo &, const QStringList &)));
p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
loadSettings();
initScriptEngine();
- // init BufferSyncer
- QHash<BufferId, MsgId> lastSeenHash = Core::bufferLastSeenMsgIds(user());
- foreach(BufferId id, lastSeenHash.keys())
- _bufferSyncer->requestSetLastSeenMsg(id, lastSeenHash[id]);
-
connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferSyncer, SLOT(storeDirtyIds()));
- p->synchronize(_bufferSyncer);
-
+ connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferViewManager, SLOT(saveBufferViews()));
- // init alias manager
+ p->synchronize(_bufferSyncer);
p->synchronize(&aliasManager());
-
- // init BacklogManager
p->synchronize(_backlogManager);
-
- // init IrcListHelper
p->synchronize(ircListHelper());
-
- // init CoreInfo
p->synchronize(&_coreInfo);
// Restore session state
- if(restoreState) restoreSessionState();
+ if(restoreState)
+ restoreSessionState();
emit initialized();
}
foreach(CoreIdentity identity, Core::identities(user())) {
createIdentity(identity);
}
- if(!_identities.count()) {
- Identity identity;
- identity.setToDefaults();
- identity.setIdentityName(tr("Default Identity"));
- createIdentity(identity, QVariantMap());
- }
foreach(NetworkInfo info, Core::networks(user())) {
createNetwork(info);
void CoreSession::saveSessionState() const {
_bufferSyncer->storeDirtyIds();
+ _bufferViewManager->saveBufferViews();
}
void CoreSession::restoreSessionState() {
QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const {
return Core::persistentChannels(user(), id);
- return QHash<QString, QString>();
}
// FIXME switch to BufferId
/*** Network Handling ***/
-void CoreSession::createNetwork(const NetworkInfo &info_) {
+void CoreSession::createNetwork(const NetworkInfo &info_, const QStringList &persistentChans) {
NetworkInfo info = info_;
int id;
id = info.networkId.toInt();
if(!_networks.contains(id)) {
+
+ // create persistent chans
+ QRegExp rx("\\s*(\\S+)(?:\\s*(\\S+))?\\s*");
+ foreach(QString channel, persistentChans) {
+ if(!rx.exactMatch(channel)) {
+ qWarning() << QString("Invalid persistent channel declaration: %1").arg(channel);
+ continue;
+ }
+ Core::bufferInfo(user(), info.networkId, BufferInfo::ChannelBuffer, rx.cap(1), true);
+ Core::setChannelPersistent(user(), info.networkId, rx.cap(1), true);
+ if(!rx.cap(2).isEmpty())
+ Core::setPersistentChannelKey(user(), info.networkId, rx.cap(1), rx.cap(2));
+ }
+
CoreNetwork *net = new CoreNetwork(id, this);
connect(net, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) {
BufferInfo bufferInfo = Core::bufferInfo(user(), networkId, BufferInfo::QueryBuffer, oldName, false);
- _bufferSyncer->renameBuffer(bufferInfo.bufferId(), newName);
+ if(bufferInfo.isValid()) {
+ _bufferSyncer->renameBuffer(bufferInfo.bufferId(), newName);
+ }
}
void CoreSession::clientsConnected() {
Identity *identity = 0;
CoreNetwork *net = 0;
IrcUser *me = 0;
- QString awayReason;
while(netIter != _networks.end()) {
net = *netIter;
netIter++;
continue;
if(identity->detachAwayEnabled() && !me->isAway()) {
- if(identity->detachAwayReasonEnabled())
+ if(!identity->detachAwayReason().isEmpty())
awayReason = identity->detachAwayReason();
- else
- awayReason = identity->awayReason();
net->setAutoAwayActive(true);
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}