Index: kvi_query.cpp
===================================================================
RCS file: /cvs/kvirccvs/kvirc/src/kvirc/ui/kvi_query.cpp,v
retrieving revision 1.34
diff -U4 -r1.34 kvi_query.cpp
--- kvirc/src/kvirc/ui/kvi_query.cpp	6 Apr 2005 20:45:02 -0000	1.34
+++ kvirc/src/kvirc/ui/kvi_query.cpp	6 Apr 2005 20:55:53 -0000
@@ -42,9 +42,8 @@
 #include "kvi_themedlabel.h"
 #include "kvi_useraction.h"
 #include "kvi_parameterlist.h"
 #include "kvi_ircconnection.h"
-#include "kvi_sparser.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
 	#include "kvi_cryptcontroller.h"
@@ -478,12 +477,10 @@
 	} else {
 		QCString szBuffer = encodeText(buffer);
 		if(!szBuffer.data())return;
 		QCString sz = connection()->encodeText(windowName());
-		KviStr buf;
-		KviServerParser::encodeCtcpParameter(szBuffer.data(),buf,false);
 		connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",
-			sz.data(),0x01,buf.ptr(),0x01);
+			sz.data(),0x01,szBuffer.data(),0x01);
 		output(KVI_OUT_ACTION,"\r!n\r%Q\r %Q",&(connection()->currentNickName()),&buffer);
 		m_pUserListView->userAction(connection()->currentNickName().latin1(),KVI_USERACTION_ACTION);
 	}
 }
Index: kvi_channel.cpp
===================================================================
RCS file: /cvs/kvirccvs/kvirc/src/kvirc/ui/kvi_channel.cpp,v
retrieving revision 1.52
diff -U4 -r1.52 kvi_channel.cpp
--- kvi_channel.cpp	6 Apr 2005 20:45:01 -0000	1.52
+++ kvi_channel.cpp	6 Apr 2005 20:55:53 -0000
@@ -55,9 +55,8 @@
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_defaults.h"
 #include "kvi_uparser.h"
-#include "kvi_sparser.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
 	#include "kvi_cryptcontroller.h"
@@ -1021,11 +1020,9 @@
 	QCString szName = connection()->encodeText(m_szName);
 	QCString szData = encodeText(buffer);
 	const char * d = szData.data();
 	if(!d)return;
-	KviStr buf;
-	KviServerParser::encodeCtcpParameter(d,buf,false);
-	connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,buf.ptr(),0x01);
+	connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,d,0x01);
 	QString szBuffer = "\r!n\r";
 	szBuffer += connection()->currentNickName();
 	szBuffer += "\r ";
 	szBuffer += buffer;