projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dcc: Retrieve transfer list on TransferManager change
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
54a93fb
..
9116541
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-47,6
+47,7
@@
#include "networkmodel.h"
#include "quassel.h"
#include "signalproxy.h"
#include "networkmodel.h"
#include "quassel.h"
#include "signalproxy.h"
+#include "transfermodel.h"
#include "util.h"
#include "clientauthhandler.h"
#include "util.h"
#include "clientauthhandler.h"
@@
-105,6
+106,7
@@
Client::Client(QObject *parent)
_networkConfig(0),
_ignoreListManager(0),
_transferManager(0),
_networkConfig(0),
_ignoreListManager(0),
_transferManager(0),
+ _transferModel(new TransferModel(this)),
_messageModel(0),
_messageProcessor(0),
_coreAccountModel(new CoreAccountModel(this)),
_messageModel(0),
_messageProcessor(0),
_coreAccountModel(new CoreAccountModel(this)),
@@
-412,9
+414,13
@@
void Client::setSyncedToCore()
_ignoreListManager = new ClientIgnoreListManager(this);
p->synchronize(ignoreListManager());
_ignoreListManager = new ClientIgnoreListManager(this);
p->synchronize(ignoreListManager());
+ // create TransferManager if core supports it
Q_ASSERT(!_transferManager);
Q_ASSERT(!_transferManager);
- _transferManager = new ClientTransferManager(this);
- p->synchronize(transferManager());
+ if (coreFeatures() & Quassel::DccFileTransfer) {
+ _transferManager = new ClientTransferManager(this);
+ _transferModel->setManager(_transferManager);
+ p->synchronize(transferManager());
+ }
// trigger backlog request once all active bufferviews are initialized
connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
// trigger backlog request once all active bufferviews are initialized
connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
@@
-487,8
+493,9
@@
void Client::setDisconnectedFromCore()
}
if (_transferManager) {
}
if (_transferManager) {
+ _transferModel->setManager(nullptr);
_transferManager->deleteLater();
_transferManager->deleteLater();
- _transferManager =
0
;
+ _transferManager =
nullptr
;
}
// we probably don't want to save pending input for reconnect
}
// we probably don't want to save pending input for reconnect
@@
-535,7
+542,7
@@
void Client::networkDestroyed()
break;
}
else {
break;
}
else {
-
netIter++
;
+
++netIter
;
}
}
}
}
}
}