projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make session restore join more than one channel per network (again).
[quassel.git]
/
src
/
core
/
networkconnection.cpp
diff --git
a/src/core/networkconnection.cpp
b/src/core/networkconnection.cpp
index
381e99d
..
3799e03
100644
(file)
--- a/
src/core/networkconnection.cpp
+++ b/
src/core/networkconnection.cpp
@@
-174,7
+174,7
@@
void NetworkConnection::networkInitialized(const QString ¤tServer) {
if(chans.count() > 0) {
qDebug() << "autojoining" << chans;
QVariantList list;
if(chans.count() > 0) {
qDebug() << "autojoining" << chans;
QVariantList list;
- foreach(QString chan, chans) list << serverEncode(chan);
+ list << serverEncode(chans.join(",")); // TODO add channel passwords
putCmd("JOIN", list); // FIXME check for 512 byte limit!
}
// delete _previousState, we won't need it again
putCmd("JOIN", list); // FIXME check for 512 byte limit!
}
// delete _previousState, we won't need it again
@@
-204,7
+204,10
@@
QVariant NetworkConnection::state() const {
}
void NetworkConnection::disconnectFromIrc() {
}
void NetworkConnection::disconnectFromIrc() {
- socket.disconnectFromHost();
+ if(socket.state() < QAbstractSocket::ConnectedState) {
+ setConnectionState(Network::Disconnected);
+ socketDisconnected();
+ } else socket.disconnectFromHost();
}
void NetworkConnection::socketHasData() {
}
void NetworkConnection::socketHasData() {