summaryrefslogtreecommitdiff
path: root/src/fe-common/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2003-01-26 00:33:29 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2003-01-26 00:33:29 +0000
commit6331a7f4473b2695a83f60a344745470837d6856 (patch)
tree99fe91636638002f74eaf3db9762edaf1e88bf03 /src/fe-common/irc
parent4431f7c99461caacbdda8d95c454078715e1fa55 (diff)
downloadirssi-6331a7f4473b2695a83f60a344745470837d6856.zip
Netjoin should now work properly with +channels and !channels.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3104 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/irc')
-rw-r--r--src/fe-common/irc/fe-netjoin.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 3d4bcc40..da786f1d 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -184,8 +184,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server)
next = tmp->next;
while (rec->now_channels != NULL) {
char *channel = rec->now_channels->data;
- char *realchannel = channel +
- (isnickflag(*channel) && ischannel(channel[1]));
+ char *realchannel = channel + 1;
temp = g_hash_table_lookup(channels, realchannel);
if (temp == NULL) {
@@ -198,7 +197,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server)
temp->count++;
if (temp->count <= netjoin_max_nicks) {
- if (isnickflag(*channel))
+ if (*channel != ' ')
g_string_append_c(temp->nicks,
*channel);
g_string_sprintfa(temp->nicks, "%s, ",
@@ -318,7 +317,7 @@ static void msg_join(IRC_SERVER_REC *server, const char *channel,
netjoin = netjoin_add(server, nick, split->channels);
netjoin->now_channels = g_slist_append(netjoin->now_channels,
- g_strdup(channel));
+ g_strconcat(" ", channel, NULL));
signal_stop();
}