SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add an option to disable rejoin on auto reconnect 

This change adds an option `irc_reconnect_rejoin` (default ON)
which when turned OFF will prevent hexchat from rejoining channels
after an auto reconnect.

hexchat/hexchat#2069
This commit is contained in:
Iwan Aucamp 2017-10-07 01:45:02 +02:00 committed by TingPing
parent 4188f26ab9
commit 8ddd5e3778
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cfgfiles.c
View File

@ -496,6 +496,7 @@ const struct prefs vars[] =
{"input_tray_priv", P_OFFINT (hex_input_tray_priv), TYPE_BOOL}, {"input_tray_priv", P_OFFINT (hex_input_tray_priv), TYPE_BOOL},
{"irc_auto_rejoin", P_OFFINT (hex_irc_auto_rejoin), TYPE_BOOL}, {"irc_auto_rejoin", P_OFFINT (hex_irc_auto_rejoin), TYPE_BOOL},
{"irc_reconnect_rejoin", P_OFFINT (hex_irc_reconnect_rejoin), TYPE_BOOL},
{"irc_ban_type", P_OFFINT (hex_irc_ban_type), TYPE_INT}, {"irc_ban_type", P_OFFINT (hex_irc_ban_type), TYPE_INT},
{"irc_cap_server_time", P_OFFINT (hex_irc_cap_server_time), TYPE_BOOL}, {"irc_cap_server_time", P_OFFINT (hex_irc_cap_server_time), TYPE_BOOL},
{"irc_conf_mode", P_OFFINT (hex_irc_conf_mode), TYPE_BOOL}, {"irc_conf_mode", P_OFFINT (hex_irc_conf_mode), TYPE_BOOL},
@ -777,6 +778,7 @@ load_default_config(void)
prefs.hex_input_flash_priv = 1; prefs.hex_input_flash_priv = 1;
prefs.hex_input_tray_hilight = 1; prefs.hex_input_tray_hilight = 1;
prefs.hex_input_tray_priv = 1; prefs.hex_input_tray_priv = 1;
prefs.hex_irc_reconnect_rejoin = 1;
prefs.hex_irc_cap_server_time = 1; prefs.hex_irc_cap_server_time = 1;
prefs.hex_irc_logging = 1; prefs.hex_irc_logging = 1;
prefs.hex_irc_who_join = 1; /* Can kick with inordinate amount of channels, required for some of our features though, TODO: add cap like away check? */ prefs.hex_irc_who_join = 1; /* Can kick with inordinate amount of channels, required for some of our features though, TODO: add cap like away check? */

1
src/common/hexchat.h
View File

@ -170,6 +170,7 @@ struct hexchatprefs
unsigned int hex_input_tray_hilight; unsigned int hex_input_tray_hilight;
unsigned int hex_input_tray_priv; unsigned int hex_input_tray_priv;
unsigned int hex_irc_auto_rejoin; unsigned int hex_irc_auto_rejoin;
unsigned int hex_irc_reconnect_rejoin;
unsigned int hex_irc_conf_mode; unsigned int hex_irc_conf_mode;
unsigned int hex_irc_hidehost; unsigned int hex_irc_hidehost;
unsigned int hex_irc_hide_nickchange; unsigned int hex_irc_hide_nickchange;

19
src/common/server.c
View File

@ -681,22 +681,25 @@ static void
auto_reconnect (server *serv, int send_quit, int err) auto_reconnect (server *serv, int send_quit, int err)
{ {
session *s; session *s;
GSList *list;
int del; int del;
if (serv->server_session == NULL) if (serv->server_session == NULL)
return; return;
list = sess_list; if (prefs.hex_irc_reconnect_rejoin)
while (list) /* make sure auto rejoin can work */
{ {
s = list->data; GSList *list;
if (s->type == SESS_CHANNEL && s->channel[0]) list = sess_list;
while (list) /* make sure auto rejoin can work */
{ {
strcpy (s->waitchannel, s->channel); s = list->data;
strcpy (s->willjoinchannel, s->channel); if (s->type == SESS_CHANNEL && s->channel[0])
{
strcpy (s->waitchannel, s->channel);
strcpy (s->willjoinchannel, s->channel);
}
list = list->next;
} }
list = list->next;
} }
if (serv->connected) if (serv->connected)