1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

irc_server_get_channels() now returns also the channels that are in

rejoin list.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@747 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-10-14 02:00:19 +00:00 committed by cras
parent 3977308cda
commit 2feb56f980

View File

@ -33,6 +33,7 @@
#include "irc.h"
#include "irc-servers-setup.h"
#include "irc-servers.h"
#include "channel-rejoin.h"
#include "server-idle.h"
#include "servers-reconnect.h"
#include "modes.h"
@ -286,17 +287,29 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
chans = g_string_new(NULL);
keys = g_string_new(NULL);
use_keys = FALSE;
/* get currently joined channels */
for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
CHANNEL_REC *channel = tmp->data;
g_string_sprintfa(chans, "%s,", channel->name);
g_string_sprintfa(keys, "%s,", channel->key == NULL ? "x" : channel->key);
g_string_sprintfa(keys, "%s,", channel->key == NULL ? "x" :
channel->key);
if (channel->key != NULL)
use_keys = TRUE;
}
/* get also the channels that are in rejoin list */
for (tmp = server->rejoin_channels; tmp != NULL; tmp = tmp->next) {
REJOIN_REC *rec = tmp->data;
g_string_sprintfa(chans, "%s,", rec->channel);
g_string_sprintfa(keys, "%s,", rec->key == NULL ? "x" :
rec->key);
if (rec->key != NULL) use_keys = TRUE;
}
if (chans->len > 0) {
g_string_truncate(chans, chans->len-1);
g_string_truncate(keys, keys->len-1);