aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2010-09-07 13:18:04 +0000
committerGravatar Fabio Bas2010-09-07 13:18:04 +0000
commit0794603ba53bb4734c2c3df0ae4860b8ced9c2d3 (patch)
treeb5ebb5996fcebae889a247344191943f18d99341 /src
parentadded IrcNet.ru (diff)
downloadKVIrc-0794603ba53bb4734c2c3df0ae4860b8ced9c2d3.tar.gz
KVIrc-0794603ba53bb4734c2c3df0ae4860b8ced9c2d3.tar.bz2
KVIrc-0794603ba53bb4734c2c3df0ae4860b8ced9c2d3.zip
fix for #951
small fix for "echo" documentation git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4988 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp3
-rw-r--r--src/kvirc/sparser/kvi_sp_literal.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 3a377b304..a62777a01 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -1100,8 +1100,7 @@ namespace KviKvsCoreSimpleCommands
@examples:
[example]
echo Hey! this is my first echo test!
- echo -i=10 This text has a specified icon and colors
- echo --icon=[fnc]$icon[/fnc](parser error) this has the colors of the parser error messages
+ echo -i=[fnc]$msgtype[/fnc](parsererror) this has the colors of the parser error messages
[/example]
@seealso:
[fnc]$window[/fnc],
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 16b5fd855..166e6c510 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -1881,7 +1881,11 @@ void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUs
case 'a':
case 'q':
- if(msg->connection()->serverInfo()->supportedListModes().contains(*aux))
+ // note: unrealircd declares q,a as CHANMODES, while inspircd declares
+ // them as PREFIXes, so we need to check them both here (ticket #951)
+ if(msg->connection()->serverInfo()->supportedListModes().contains(*aux) ||
+ msg->connection()->serverInfo()->isSupportedModeFlag(*aux)
+ )
{
// (freenode) ircd-seven's quite ban (channel mode q with mask)
// (ircq) unrealircd's channel owner (channel mode q with nickname)