From 67cc9af1bd825268e0bf12dca262bdbf64e56d29 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 20 Aug 2000 07:17:13 +0000 Subject: Channel mode handling changed - there's no more mode_xxx fields in channel structure, but instead just one mode string field. Also handling half-ops (+h) should work right. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@617 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/irc/fe-channels.c | 5 +---- src/fe-common/irc/fe-netjoin.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/fe-common') diff --git a/src/fe-common/irc/fe-channels.c b/src/fe-common/irc/fe-channels.c index 4c1a7011..1d41c70f 100644 --- a/src/fe-common/irc/fe-channels.c +++ b/src/fe-common/irc/fe-channels.c @@ -149,7 +149,6 @@ static void cmd_channel_list_joined(void) CHANNEL_REC *channel; GString *nicks; GSList *nicklist, *tmp, *ntmp; - char *mode; if (channels == NULL) { printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NOT_IN_CHANNELS); @@ -167,7 +166,6 @@ static void cmd_channel_list_joined(void) channel = tmp->data; nicklist = nicklist_getnicks(channel); - mode = channel_get_mode(channel); nicks = g_string_new(NULL); for (ntmp = nicklist; ntmp != NULL; ntmp = ntmp->next) { NICK_REC *rec = ntmp->data; @@ -177,9 +175,8 @@ static void cmd_channel_list_joined(void) if (nicks->len > 1) g_string_truncate(nicks, nicks->len-1); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_CHANLIST_LINE, - channel->name, mode, channel->server->tag, nicks->str); + channel->name, channel->mode, channel->server->tag, nicks->str); - g_free(mode); g_slist_free(nicklist); g_string_free(nicks, TRUE); } diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c index 9cb77ed2..e6c50c1e 100644 --- a/src/fe-common/irc/fe-netjoin.c +++ b/src/fe-common/irc/fe-netjoin.c @@ -359,7 +359,7 @@ static void event_mode(const char *data, IRC_SERVER_REC *server, show = TRUE; nick++; } else { - if (HAS_MODE_ARG(*mode) && *nick != NULL) + if (HAS_MODE_ARG(type, *mode) && *nick != NULL) nick++; show = TRUE; } -- cgit v1.2.3