projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first version of postgres backend
[quassel.git]
/
src
/
core
/
coresession.cpp
diff --git
a/src/core/coresession.cpp
b/src/core/coresession.cpp
index
c90e7f6
..
7a4f622
100644
(file)
--- a/
src/core/coresession.cpp
+++ b/
src/core/coresession.cpp
@@
-272,6
+272,7
@@
void CoreSession::createIdentity(const Identity &identity, const QVariantMap &ad
if(additional.contains("CertPem"))
coreIdentity.setSslCert(additional["CertPem"].toByteArray());
#endif
if(additional.contains("CertPem"))
coreIdentity.setSslCert(additional["CertPem"].toByteArray());
#endif
+ qDebug() << Q_FUNC_INFO;
IdentityId id = Core::createIdentity(user(), coreIdentity);
if(!id.isValid())
return;
IdentityId id = Core::createIdentity(user(), coreIdentity);
if(!id.isValid())
return;
@@
-379,7
+380,6
@@
void CoreSession::clientsConnected() {
Identity *identity = 0;
CoreNetwork *net = 0;
IrcUser *me = 0;
Identity *identity = 0;
CoreNetwork *net = 0;
IrcUser *me = 0;
- QString awayReason;
while(netIter != _networks.end()) {
net = *netIter;
netIter++;
while(netIter != _networks.end()) {
net = *netIter;
netIter++;
@@
-419,10
+419,8
@@
void CoreSession::clientsDisconnected() {
continue;
if(identity->detachAwayEnabled() && !me->isAway()) {
continue;
if(identity->detachAwayEnabled() && !me->isAway()) {
- if(
identity->detachAwayReasonEnabled
())
+ if(
!identity->detachAwayReason().isEmpty
())
awayReason = identity->detachAwayReason();
awayReason = identity->detachAwayReason();
- else
- awayReason = identity->awayReason();
net->setAutoAwayActive(true);
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}
net->setAutoAwayActive(true);
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}