aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Fabio Bas2010-03-15 17:04:29 +0000
committerGravatar Fabio Bas2010-03-15 17:04:29 +0000
commit769f001d1f69d98dee37ae57ad942e70c0941d79 (patch)
treeb0f79e22c950bff6f4608c46e4c6a9974831d4eb
parentupdated polish translation by Be Mi (diff)
downloadKVIrc-769f001d1f69d98dee37ae57ad942e70c0941d79.tar.gz
KVIrc-769f001d1f69d98dee37ae57ad942e70c0941d79.tar.bz2
KVIrc-769f001d1f69d98dee37ae57ad942e70c0941d79.zip
fixed server's autojoin channel list not prepending # to channel name when necessary; added the +channel format aswell
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4136 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--src/kvirc/kernel/kvi_ircconnection.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 5aeb9704b..baae6caf2 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -1476,7 +1476,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
}
delete target()->server()->m_pReconnectInfo;
target()->server()->m_pReconnectInfo=0;
- }else {
+ } else {
if(target()->network()->autoJoinChannelList())
{
if(_OUTPUT_VERBOSE)
@@ -1493,14 +1493,14 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
if(!szChannels.isEmpty())
szChannels.append(",");
szCurChan = (*it).section(':',0,0);
- if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!'))
+ if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!' || szCurChan[0]=='+'))
szCurChan.prepend('#');
szChannels.append(szCurChan);
} else {
if(!szProtectedChannels.isEmpty())
szProtectedChannels.append(",");
szCurChan = (*it).section(':',0,0);
- if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!'))
+ if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!' || szCurChan[0]=='+'))
szCurChan.prepend('#');
szProtectedChannels.append(szCurChan);
if(!szPasswords.isEmpty())
@@ -1527,14 +1527,14 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
if(!szChannels.isEmpty())
szChannels.append(",");
szCurChan = (*it).section(':',0,0);
- if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!'))
- szCurChan.prepend(':');
+ if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!' || szCurChan[0]=='+'))
+ szCurChan.prepend('#');
szChannels.append(szCurChan);
} else {
if(!szProtectedChannels.isEmpty())
szProtectedChannels.append(",");
szCurChan = (*it).section(':',0,0);
- if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!'))
+ if(!(szCurChan[0]=='#' || szCurChan[0]=='&' || szCurChan[0]=='!' || szCurChan[0]=='+'))
szCurChan.prepend('#');
szProtectedChannels.append(szCurChan);
if(!szPasswords.isEmpty())