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 819ae3027d into 1f2b171819

Browse source
This commit is contained in:
vague666 2014-12-11 22:57:17 +00:00
commit 854f2efd59
1 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

45
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"
@ -61,6 +62,7 @@ void irc_servers_reconnect_init(void);
void irc_servers_reconnect_deinit(void); void irc_servers_reconnect_deinit(void);
static int cmd_tag; static int cmd_tag;
static char *rejoin_channels_mode;
static int isnickflag_func(SERVER_REC *server, char flag) static int isnickflag_func(SERVER_REC *server, char flag)
{ {
@ -586,6 +588,11 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
GSList *tmp; GSList *tmp;
GString *chans, *keys; GString *chans, *keys;
char *ret; char *ret;
rejoin_channels_mode = 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, "on") != 0 && g_ascii_strcasecmp(rejoin_channels_mode, "on") != 0))
rejoin_channels_mode = g_strdup("on");
int use_keys; int use_keys;
g_return_val_if_fail(server != NULL, FALSE); g_return_val_if_fail(server != NULL, FALSE);
@ -594,25 +601,40 @@ char *irc_server_get_channels(IRC_SERVER_REC *server)
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);
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,
g_string_append_printf(chans, "%s,", channel->name); channel->server->connrec->chatnet);
g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" : if ((setup != NULL && setup->autojoin && g_ascii_strcasecmp(rejoin_channels_mode, "auto") == 0) || g_ascii_strcasecmp(rejoin_channels_mode, "on") == 0) {
channel->key); g_string_append_printf(chans, "%s,", channel->name);
if (channel->key != NULL) g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" :
use_keys = TRUE; channel->key);
if (channel->key != NULL)
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);
g_string_append_printf(chans, "%s,", rec->channel); 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(keys, "%s,", rec->key == NULL ? "x" : g_string_append_printf(chans, "%s,", rec->channel);
rec->key); g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" :
if (rec->key != NULL) use_keys = TRUE; rec->key);
if (rec->key != NULL) use_keys = TRUE;
}
} }
if (chans->len > 0) { if (chans->len > 0) {
@ -969,6 +991,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", "");
@ -1003,6 +1026,8 @@ void irc_servers_deinit(void)
{ {
if (cmd_tag != -1) if (cmd_tag != -1)
g_source_remove(cmd_tag); g_source_remove(cmd_tag);
if (rejoin_channels_mode != NULL)
g_free(rejoin_channels_mode);
signal_remove("server connected", (SIGNAL_FUNC) sig_connected); signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected); signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);