aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2010-11-07 20:15:37 +0000
committerGravatar Szymon Tomasz Stefanek2010-11-07 20:15:37 +0000
commite871deb7a496c92a7028e264322ae5a71b2a798b (patch)
treeaa0654b555b820982d35542e82465dc19e4a62dd /src
parentavoid to inline overload a non-virtual method of QApplication, sicne it could... (diff)
downloadKVIrc-e871deb7a496c92a7028e264322ae5a71b2a798b.tar.gz
KVIrc-e871deb7a496c92a7028e264322ae5a71b2a798b.tar.bz2
KVIrc-e871deb7a496c92a7028e264322ae5a71b2a798b.zip
Do not escape KVS twice in /help
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5135 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp3
-rw-r--r--src/modules/rijndael/libkvirijndael.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 2fc74720b..424561ea9 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -152,9 +152,6 @@ namespace KviKvsCoreSimpleCommands
if(KVSCSC_pSwitches->find('m',"mdi"))szSwitches.append("-m ");
if(KVSCSC_pSwitches->find('n',"new"))szSwitches.append("-n ");
- if(szParams[0]==QChar('$'))
- szParams.prepend('\\');
-
if(szParams.endsWith("()"))
szParams.chop(2);
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 349769c4c..926ed1f09 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -430,6 +430,8 @@
szIn.cutLeft(5);
else if(kvi_strEqualCSN(inBuffer,"+OK ",4))
szIn.cutLeft(4);
+ else if(kvi_strEqualCSN(inBuffer,"OK ",3)) // some servers strip out the +
+ szIn.cutLeft(3);
else {
plainText = szIn;
return KviCryptEngine::DecryptOkWasPlainText;