projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trim incoming lines again, apparently allowing trailing spaces has weird side-effect...
[quassel.git]
/
src
/
core
/
networkconnection.cpp
diff --git
a/src/core/networkconnection.cpp
b/src/core/networkconnection.cpp
index
163f220
..
43749bc
100644
(file)
--- a/
src/core/networkconnection.cpp
+++ b/
src/core/networkconnection.cpp
@@
-347,6
+347,10
@@
void NetworkConnection::socketInitialized() {
disconnectFromIrc();
return;
}
disconnectFromIrc();
return;
}
+ QString passwd = network()->serverList()[_lastUsedServerlistIndex].toMap()["Password"].toString();
+ if(!passwd.isEmpty()) {
+ putRawLine(serverEncode(QString("PASS %1").arg(passwd)));
+ }
putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0]))); // FIXME: try more nicks if error occurs
putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
}
putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0]))); // FIXME: try more nicks if error occurs
putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
}