projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check for qca provider plugin, fixes #1045
[quassel.git]
/
src
/
core
/
coreuserinputhandler.cpp
diff --git
a/src/core/coreuserinputhandler.cpp
b/src/core/coreuserinputhandler.cpp
index
8289eaa
..
f1654a4
100644
(file)
--- a/
src/core/coreuserinputhandler.cpp
+++ b/
src/core/coreuserinputhandler.cpp
@@
-21,7
+21,7
@@
#include "util.h"
#include "util.h"
-#include "ctcp
handl
er.h"
+#include "ctcp
pars
er.h"
#include <QRegExp>
#include <QRegExp>
@@
-154,7
+154,8
@@
void CoreUserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QStrin
message = QString::number(now);
}
message = QString::number(now);
}
- network()->ctcpHandler()->query(nick, ctcpTag, message);
+ // FIXME make this a proper event
+ coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), nick, ctcpTag, message);
emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick());
}
emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick());
}
@@
-163,6
+164,9
@@
void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QStr
if(!bufferInfo.isValid())
return;
if(!bufferInfo.isValid())
return;
+ if(!Cipher::neededFeaturesAvailable())
+ return;
+
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
if(parms.isEmpty() && !bufferInfo.bufferName().isEmpty())
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
if(parms.isEmpty() && !bufferInfo.bufferName().isEmpty())
@@
-309,7
+313,8
@@
void CoreUserInputHandler::handleList(const BufferInfo &bufferInfo, const QStrin
void CoreUserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) {
if(bufferInfo.bufferName().isEmpty()) return; // server buffer
void CoreUserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) {
if(bufferInfo.bufferName().isEmpty()) return; // server buffer
- network()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg);
+ // FIXME make this a proper event
+ coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), bufferInfo.bufferName(), "ACTION", msg);
emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
}
emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
}
@@
-452,6
+457,9
@@
void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QStr
if(!bufferInfo.isValid())
return;
if(!bufferInfo.isValid())
return;
+ if(!Cipher::neededFeaturesAvailable())
+ return;
+
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
if(parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
if(parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
@@
-636,6
+644,9
@@
QByteArray CoreUserInputHandler::encrypt(const QString &target, const QByteArray
if(message_.isEmpty())
return message_;
if(message_.isEmpty())
return message_;
+ if(!Cipher::neededFeaturesAvailable())
+ return message_;
+
Cipher *cipher = network()->cipher(target);
if(!cipher)
return message_;
Cipher *cipher = network()->cipher(target);
if(!cipher)
return message_;