zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 10:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge ac1999ea01 into 14c7c0484c

Browse source
This commit is contained in:
Jari Matilainen 2015-08-05 14:50:10 +00:00
commit f881b352fb
1 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/irc/core/irc-servers.c
View file

@ -32,6 +32,7 @@
#include "irc-queries.h" #include "irc-queries.h"
#include "irc-servers-setup.h" #include "irc-servers-setup.h"
#include "irc-servers.h" #include "irc-servers.h"
#include "channels-setup.h"
#include "channel-rejoin.h" #include "channel-rejoin.h"
#include "servers-idle.h" #include "servers-idle.h"
#include "servers-reconnect.h" #include "servers-reconnect.h"
@ -586,37 +587,65 @@ void irc_servers_start_cmd_timeout(void)
like "#a,#b,#c,#d x,b_chan_key,x,x" or just "#e,#f,#g" */ like "#a,#b,#c,#d x,b_chan_key,x,x" or just "#e,#f,#g" */
char *irc_server_get_channels(IRC_SERVER_REC *server) char *irc_server_get_channels(IRC_SERVER_REC *server)
{ {
g_return_val_if_fail(server != NULL, FALSE);
GSList *tmp; GSList *tmp;
GString *chans, *keys; GString *chans, *keys;
char *ret; char *ret;
int use_keys;
g_return_val_if_fail(server != NULL, FALSE); int use_keys;
char *rejoin_channels_mode = g_strdup(settings_get_str("rejoin_channels_on_reconnect"));
if (rejoin_channels_mode == NULL ||
(g_ascii_strcasecmp(rejoin_channels_mode, "on") != 0 &&
g_ascii_strcasecmp(rejoin_channels_mode, "off") != 0 &&
g_ascii_strcasecmp(rejoin_channels_mode, "auto") != 0)) {
g_warning("Invalid value for 'rejoin_channels_on_reconnect', valid values are 'on', 'off', 'auto', using 'on' as default value.");
rejoin_channels_mode = g_strdup("on");
}
chans = g_string_new(NULL); chans = g_string_new(NULL);
keys = g_string_new(NULL); keys = g_string_new(NULL);
use_keys = FALSE; use_keys = FALSE;
/* do we want to rejoin channels in the first place? */
if(g_ascii_strcasecmp(rejoin_channels_mode, "off") == 0) {
g_string_free(chans, TRUE);
g_string_free(keys, TRUE);
g_free(rejoin_channels_mode);
return g_strdup("");
}
/* get currently joined channels */ /* get currently joined channels */
for (tmp = server->channels; tmp != NULL; tmp = tmp->next) { for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
CHANNEL_REC *channel = tmp->data; CHANNEL_REC *channel = tmp->data;
CHANNEL_SETUP_REC *setup = channel_setup_find(channel->name,
channel->server->connrec->chatnet);
if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) ||
g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
g_string_append_printf(chans, "%s,", channel->name); g_string_append_printf(chans, "%s,", channel->name);
g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" : g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" :
channel->key); channel->key);
if (channel->key != NULL) if (channel->key != NULL)
use_keys = TRUE; use_keys = TRUE;
} }
}
/* get also the channels that are in rejoin list */ /* get also the channels that are in rejoin list */
for (tmp = server->rejoin_channels; tmp != NULL; tmp = tmp->next) { for (tmp = server->rejoin_channels; tmp != NULL; tmp = tmp->next) {
REJOIN_REC *rec = tmp->data; REJOIN_REC *rec = tmp->data;
CHANNEL_SETUP_REC *setup = channel_setup_find(rec->channel,
server->tag);
if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) ||
g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
g_string_append_printf(chans, "%s,", rec->channel); g_string_append_printf(chans, "%s,", rec->channel);
g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" : g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" :
rec->key); rec->key);
if (rec->key != NULL) use_keys = TRUE; if (rec->key != NULL) use_keys = TRUE;
} }
}
if (chans->len > 0) { if (chans->len > 0) {
g_string_truncate(chans, chans->len-1); g_string_truncate(chans, chans->len-1);
@ -627,6 +656,7 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
ret = chans->str; ret = chans->str;
g_string_free(chans, FALSE); g_string_free(chans, FALSE);
g_string_free(keys, TRUE); g_string_free(keys, TRUE);
g_free(rejoin_channels_mode);
return ret; return ret;
} }
@ -972,6 +1002,7 @@ void irc_server_init_isupport(IRC_SERVER_REC *server)
void irc_servers_init(void) void irc_servers_init(void)
{ {
settings_add_str("servers", "rejoin_channels_on_reconnect", "on");
settings_add_str("misc", "usermode", DEFAULT_USER_MODE); settings_add_str("misc", "usermode", DEFAULT_USER_MODE);
settings_add_str("misc", "split_line_start", ""); settings_add_str("misc", "split_line_start", "");
settings_add_str("misc", "split_line_end", ""); settings_add_str("misc", "split_line_end", "");