X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircparser.cpp;h=f5363554443ad194e98ab4448210daa228b10eee;hp=f3db4fceab455ba03de4849452c2a9606204e690;hb=e50ae7a06fc4e5d3a911c361d30953410deab609;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp
index f3db4fce..f5363554 100644
--- a/src/core/ircparser.cpp
+++ b/src/core/ircparser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   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
-                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));
-                } 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
@@ -308,6 +308,11 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
         for (int i = decParams.count(); i < params.count(); i++)
             decParams << net->serverDecode(params.at(i));
 
+        // We want to trim the last param just in case, except for PRIVMSG and NOTICE
+        // ... but those happen to be the only ones not using defaultHandling anyway
+        if (!decParams.isEmpty() && decParams.last().endsWith(' '))
+            decParams.append(decParams.takeLast().trimmed());
+
         IrcEvent *event;
         if (type == EventManager::IrcEventNumeric)
             event = new IrcEventNumeric(num, net, prefix, target);