projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement password changing from client.
[quassel.git]
/
src
/
core
/
ircparser.cpp
diff --git
a/src/core/ircparser.cpp
b/src/core/ircparser.cpp
index
0d47398
..
f536355
100644
(file)
--- a/
src/core/ircparser.cpp
+++ b/
src/core/ircparser.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-232,9
+232,9
@@
void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
#ifdef HAVE_QCA2
// Handle DH1080 key exchange
#ifdef HAVE_QCA2
// Handle DH1080 key exchange
- if (params[1].startsWith("DH1080_INIT")) {
+ if (params[1].startsWith("DH1080_INIT")
&& !net->isChannelName(target)
) {
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Init, params[1].mid(12));
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Init, params[1].mid(12));
- } else if (params[1].startsWith("DH1080_FINISH")) {
+ } else if (params[1].startsWith("DH1080_FINISH")
&& !net->isChannelName(target)
) {
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Finish, params[1].mid(14));
} else
#endif
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Finish, params[1].mid(14));
} else
#endif