summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--doc/de/autogen/user/irc_options.txt2
-rw-r--r--doc/en/autogen/user/irc_options.txt2
-rw-r--r--doc/fr/autogen/user/irc_options.txt2
-rw-r--r--doc/it/autogen/user/irc_options.txt2
-rw-r--r--doc/ja/autogen/user/irc_options.txt2
-rw-r--r--doc/pl/autogen/user/irc_options.txt2
-rw-r--r--src/plugins/irc/irc-config.c2
8 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f26cca636..8e36982c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* api: add integer return code for functions hook_{signal|hsignal}_send
* alias: change default command for alias /beep to "/print -beep"
* guile: fix module used after unload of a script
+* irc: set option irc.network.autoreconnect_delay_max to 600 by default,
+ increase max value to 604800 seconds (7 days)
* irc: fix read of MODES server value when in commands /op, /deop, /voice,
/devoice, /halfop, /dehalfop
* irc: set option irc.network.whois_double_nick to "off" by default
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index b4b20f742..59276e27b 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -351,7 +351,7 @@
* [[option_irc.network.autoreconnect_delay_max]] *irc.network.autoreconnect_delay_max*
** Beschreibung: `maximale Verzögerung bei der automatischen Wiederverbindung zum Server (in Sekunden, 0 = keine Begrenzung)`
** Typ: integer
-** Werte: 0 .. 86400 (Standardwert: `1800`)
+** Werte: 0 .. 604800 (Standardwert: `600`)
* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default*
** Beschreibung: `Vorgabewert für Befehle /ban, /unban und /kickban; Variablen $nick, $user und $host werden durch den jeweiligen Wert ersetzt (extrahiert aus "nick!user@host"); diese Vorgabemaske wird nur angewendet, sofern WeeChat den Host des Nicks ermitteln kann`
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 03b2247b0..cb32f7264 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -351,7 +351,7 @@
* [[option_irc.network.autoreconnect_delay_max]] *irc.network.autoreconnect_delay_max*
** description: `maximum autoreconnect delay to server (in seconds, 0 = no maximum)`
** type: integer
-** values: 0 .. 86400 (default value: `1800`)
+** values: 0 .. 604800 (default value: `600`)
* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default*
** description: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick`
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 8665aba30..ed07ac2c1 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -351,7 +351,7 @@
* [[option_irc.network.autoreconnect_delay_max]] *irc.network.autoreconnect_delay_max*
** description: `délai maximum d'auto-reconnexion au serveur (en secondes, 0 = pas de maximum)`
** type: entier
-** valeurs: 0 .. 86400 (valeur par défaut: `1800`)
+** valeurs: 0 .. 604800 (valeur par défaut: `600`)
* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default*
** description: `masque de bannissement par défaut pour les commandes /ban, /unban et /kickban; les variables $nick, $user et $host sont remplacées par leurs valeurs (extraites de "nick!user@host"); ce masque par défaut est utilisé seulement si WeeChat connaît l'hôte pour le pseudo`
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index a77e2bf9a..5240d7c75 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -351,7 +351,7 @@
* [[option_irc.network.autoreconnect_delay_max]] *irc.network.autoreconnect_delay_max*
** descrizione: `ritardo massimo per la riconnessione automatica al server (in secondi, 0 = nessun massimo)`
** tipo: intero
-** valori: 0 .. 86400 (valore predefinito: `1800`)
+** valori: 0 .. 604800 (valore predefinito: `600`)
* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default*
** descrizione: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick`
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index 18df89b97..9bfb33061 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -351,7 +351,7 @@
* [[option_irc.network.autoreconnect_delay_max]] *irc.network.autoreconnect_delay_max*
** 説明: `サーバへの自動接続の遅延時間の最大値 (秒単位、0 = 制限無し)`
** タイプ: 整数
-** 値: 0 .. 86400 (デフォルト値: `1800`)
+** 値: 0 .. 604800 (デフォルト値: `600`)
* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default*
** 説明: `/ban、/unban、/kickban コマンドが使うデフォルトの禁止マスク; 変数 $nick、$user、$host はそれぞれの値に置換 ("nick!user@host" から展開) されます; このデフォルトマスクはニックネームのホスト名がわかる場合のみ利用されます`
diff --git a/doc/pl/autogen/user/irc_options.txt b/doc/pl/autogen/user/irc_options.txt
index 4930a9954..ebf970942 100644
--- a/doc/pl/autogen/user/irc_options.txt
+++ b/doc/pl/autogen/user/irc_options.txt
@@ -351,7 +351,7 @@
* [[option_irc.network.autoreconnect_delay_max]] *irc.network.autoreconnect_delay_max*
** opis: `maksymalne opóźnienie do ponownego połączenia z serwerem (w sekundach, 0 = brak maksimum)`
** typ: liczba
-** wartości: 0 .. 86400 (domyślna wartość: `1800`)
+** wartości: 0 .. 604800 (domyślna wartość: `600`)
* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default*
** opis: `domyślna maska dla bana dla komend /ban, /unban i /kickban; zmienne $nick, $user, i $host są zastępowane odpowiednimi wartościami (pobranymi z "nick!user@host"); domyślna maska używana jest tylko, kiedy WeeChat zna nazwę hosta dla nicka`
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index eceadac19..e965b96ca 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -2758,7 +2758,7 @@ irc_config_init ()
irc_config_file, ptr_section,
"autoreconnect_delay_max", "integer",
N_("maximum autoreconnect delay to server (in seconds, 0 = no maximum)"),
- NULL, 0, 3600 * 24, "1800", NULL, 0, NULL, NULL,
+ NULL, 0, 3600 * 24 * 7, "600", NULL, 0, NULL, NULL,
NULL, NULL, NULL, NULL);
irc_config_network_ban_mask_default = weechat_config_new_option (
irc_config_file, ptr_section,