X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=9ef23efb3e9ad8db907621b3f9ba36bbe73286fe;hp=fe49f774049e4fd11df6cac1d6458039415ad237;hb=44212b2131e958c40ca26b9f49289590d8f83145;hpb=04315f46a16fc3627218377071e008b6b9744992 diff --git a/src/client/client.cpp b/src/client/client.cpp index fe49f774..9ef23efb 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -34,6 +34,7 @@ #include "clientirclisthelper.h" #include "clientidentity.h" #include "clientignorelistmanager.h" +#include "clienttransfermanager.h" #include "clientuserinputhandler.h" #include "coreaccountmodel.h" #include "coreconnection.h" @@ -102,10 +103,11 @@ Client::Client(QObject *parent) _inputHandler(0), _networkConfig(0), _ignoreListManager(0), + _transferManager(0), _messageModel(0), _messageProcessor(0), _coreAccountModel(new CoreAccountModel(this)), - _coreConnection(new CoreConnection(_coreAccountModel, this)), + _coreConnection(new CoreConnection(this)), _connected(false), _debugLog(&_debugLogBuffer) { @@ -404,6 +406,10 @@ void Client::setSyncedToCore() _ignoreListManager = new ClientIgnoreListManager(this); signalProxy()->synchronize(ignoreListManager()); + Q_ASSERT(!_transferManager); + _transferManager = new ClientTransferManager(this); + signalProxy()->synchronize(transferManager()); + // trigger backlog request once all active bufferviews are initialized connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog())); @@ -473,6 +479,12 @@ void Client::setDisconnectedFromCore() _ignoreListManager->deleteLater(); _ignoreListManager = 0; } + + if (_transferManager) { + _transferManager->deleteLater(); + _transferManager = 0; + } + // we probably don't want to save pending input for reconnect _userInputBuffer.clear();