diff options
author | LemonBoy <thatlemon@gmail.com> | 2015-05-15 16:42:51 +0200 |
---|---|---|
committer | LemonBoy <thatlemon@gmail.com> | 2015-05-15 17:07:30 +0200 |
commit | 16c71cf1fbc1e7987fdde821813005b87237e951 (patch) | |
tree | d5af65015c8f3acd5c9c0fe3ac3d8950ebf85637 /src/irc/core/irc-channels.c | |
parent | c122a2a226363114e11f32072395e2f06ad6a450 (diff) | |
download | irssi-16c71cf1fbc1e7987fdde821813005b87237e951.zip |
Implement CHANTYPES support
Diffstat (limited to 'src/irc/core/irc-channels.c')
-rw-r--r-- | src/irc/core/irc-channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c index e38cb98b..add18acf 100644 --- a/src/irc/core/irc-channels.c +++ b/src/irc/core/irc-channels.c @@ -99,7 +99,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data, tmp = chanlist; for (;; tmp++) { if (*tmp != NULL) { - channel = ischannel(**tmp) ? g_strdup(*tmp) : + channel = server_ischannel(SERVER(server), *tmp) ? g_strdup(*tmp) : g_strdup_printf("#%s", *tmp); chanrec = irc_channel_find(server, channel); @@ -134,7 +134,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data, if (use_keys) cmdlen += outkeys->len; if (*tmpstr != NULL) - cmdlen += ischannel(**tmpstr) ? strlen(*tmpstr) : + cmdlen += server_ischannel(SERVER(server), *tmpstr) ? strlen(*tmpstr) : strlen(*tmpstr)+1; if (*tmpkey != NULL) cmdlen += strlen(*tmpkey); |