projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow prioritizing QUIT over other commands
[quassel.git]
/
src
/
core
/
ircparser.cpp
diff --git
a/src/core/ircparser.cpp
b/src/core/ircparser.cpp
index
681346c
..
44b4b52
100644
(file)
--- a/
src/core/ircparser.cpp
+++ b/
src/core/ircparser.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 *
@@
-186,7
+186,7
@@
void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
QStringList targets = net->serverDecode(params.at(0)).split(',', QString::SkipEmptyParts);
QStringList::const_iterator targetIter;
for (targetIter = targets.constBegin(); targetIter != targets.constEnd(); ++targetIter) {
QStringList targets = net->serverDecode(params.at(0)).split(',', QString::SkipEmptyParts);
QStringList::const_iterator targetIter;
for (targetIter = targets.constBegin(); targetIter != targets.constEnd(); ++targetIter) {
- QString target = net->isChannelName(*targetIter) ? *targetIter : senderNick;
+ QString target = net->isChannelName(*targetIter)
|| net->isStatusMsg(*targetIter)
? *targetIter : senderNick;
msg = decrypt(net, target, msg);
msg = decrypt(net, target, msg);
@@
-280,10
+280,13
@@
void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
case EventManager::IrcEventAway:
{
case EventManager::IrcEventAway:
{
+ // Update hostmask info first. This will create the nick if it doesn't exist, e.g.
+ // away-notify data being sent before JOIN messages.
+ net->updateNickFromMask(prefix);
+ // Separate nick in order to separate server and user decoding
QString nick = nickFromMask(prefix);
decParams << nick;
decParams << (params.count() >= 1 ? net->userDecode(nick, params.at(0)) : QString());
QString nick = nickFromMask(prefix);
decParams << nick;
decParams << (params.count() >= 1 ? net->userDecode(nick, params.at(0)) : QString());
- net->updateNickFromMask(prefix);
}
break;
}
break;