diff --git a/doc/de/autogen/user/irc_options.adoc b/doc/de/autogen/user/irc_options.adoc index 1a7494568..4cbef41de 100644 --- a/doc/de/autogen/user/irc_options.adoc +++ b/doc/de/autogen/user/irc_options.adoc @@ -617,6 +617,11 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `+on+`) +* [[option_irc.server_default.usermode]] *irc.server_default.usermode* +** Beschreibung: pass:none[usermode to set after connection to server and before executing command and the auto-join of channels; this option gives same result as defining a command "/mode $nick "] +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `+""+`) + * [[option_irc.server_default.username]] *irc.server_default.username* ** Beschreibung: pass:none[Username der auf dem Server genutzt werden soll (Hinweis: Inhalt wird evaluiert, siehe /help eval)] ** Typ: Zeichenkette diff --git a/doc/en/autogen/user/irc_options.adoc b/doc/en/autogen/user/irc_options.adoc index 0639f2723..8d70ae681 100644 --- a/doc/en/autogen/user/irc_options.adoc +++ b/doc/en/autogen/user/irc_options.adoc @@ -617,6 +617,11 @@ ** type: boolean ** values: on, off (default value: `+on+`) +* [[option_irc.server_default.usermode]] *irc.server_default.usermode* +** description: pass:none[usermode to set after connection to server and before executing command and the auto-join of channels; this option gives same result as defining a command "/mode $nick "] +** type: string +** values: any string (default value: `+""+`) + * [[option_irc.server_default.username]] *irc.server_default.username* ** description: pass:none[user name to use on server (note: content is evaluated, see /help eval)] ** type: string diff --git a/doc/fr/autogen/user/irc_options.adoc b/doc/fr/autogen/user/irc_options.adoc index fa60dea44..d70b57ca9 100644 --- a/doc/fr/autogen/user/irc_options.adoc +++ b/doc/fr/autogen/user/irc_options.adoc @@ -617,6 +617,11 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `+on+`) +* [[option_irc.server_default.usermode]] *irc.server_default.usermode* +** description: pass:none[mode utilisateur à définir après la connexion au serveur et avant d'exécuter la commande et de rejoindre automatiquement les canaux ; cette option donne le même résultat que la définition de la commande "/mode $nick "] +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `+""+`) + * [[option_irc.server_default.username]] *irc.server_default.username* ** description: pass:none[nom d'utilisateur pour le serveur (note : le contenu est évalué, voir /help eval)] ** type: chaîne diff --git a/doc/it/autogen/user/irc_options.adoc b/doc/it/autogen/user/irc_options.adoc index 751023fb0..f5bcfd92d 100644 --- a/doc/it/autogen/user/irc_options.adoc +++ b/doc/it/autogen/user/irc_options.adoc @@ -617,6 +617,11 @@ ** tipo: bool ** valori: on, off (valore predefinito: `+on+`) +* [[option_irc.server_default.usermode]] *irc.server_default.usermode* +** descrizione: pass:none[usermode to set after connection to server and before executing command and the auto-join of channels; this option gives same result as defining a command "/mode $nick "] +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `+""+`) + * [[option_irc.server_default.username]] *irc.server_default.username* ** descrizione: pass:none[user name to use on server (note: content is evaluated, see /help eval)] ** tipo: stringa diff --git a/doc/ja/autogen/user/irc_options.adoc b/doc/ja/autogen/user/irc_options.adoc index 1696a60fc..3a81f26df 100644 --- a/doc/ja/autogen/user/irc_options.adoc +++ b/doc/ja/autogen/user/irc_options.adoc @@ -617,6 +617,11 @@ ** タイプ: ブール ** 値: on, off (デフォルト値: `+on+`) +* [[option_irc.server_default.usermode]] *irc.server_default.usermode* +** 説明: pass:none[usermode to set after connection to server and before executing command and the auto-join of channels; this option gives same result as defining a command "/mode $nick "] +** タイプ: 文字列 +** 値: 未制約文字列 (デフォルト値: `+""+`) + * [[option_irc.server_default.username]] *irc.server_default.username* ** 説明: pass:none[サーバで使用するユーザ名 (注意: 値は評価されます、/help eval を参照してください)] ** タイプ: 文字列 diff --git a/doc/pl/autogen/user/irc_options.adoc b/doc/pl/autogen/user/irc_options.adoc index 092ab923b..6e2659c7a 100644 --- a/doc/pl/autogen/user/irc_options.adoc +++ b/doc/pl/autogen/user/irc_options.adoc @@ -617,6 +617,11 @@ ** typ: bool ** wartości: on, off (domyślna wartość: `+on+`) +* [[option_irc.server_default.usermode]] *irc.server_default.usermode* +** opis: pass:none[usermode to set after connection to server and before executing command and the auto-join of channels; this option gives same result as defining a command "/mode $nick "] +** typ: ciąg +** wartości: dowolny ciąg (domyślna wartość: `+""+`) + * [[option_irc.server_default.username]] *irc.server_default.username* ** opis: pass:none[nazwa użytkownika do użycia na serwerze (uwaga: zawartość jest przetwarzana, zobacz /help eval)] ** typ: ciąg diff --git a/po/cs.po b/po/cs.po index 5fe2ad9e3..ef1684002 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -7207,6 +7207,12 @@ msgid "" msgstr "" "seznam notifikací pro server (místo změny této volby použijte příkaz /notify)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: chyba při přidávání notifikace" diff --git a/po/de.po b/po/de.po index 26e9ea718..ec9b6ac40 100644 --- a/po/de.po +++ b/po/de.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-12-04 09:56+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -8358,6 +8358,12 @@ msgstr "" "Liste mit Benachrichtigung für Server (diese Einstellung sollte nicht direkt " "verändert werden. Dazu sollte der Befehl /notify genutzt werden)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: Fehler bei der Erstellung des Servers \"%s\"" diff --git a/po/es.po b/po/es.po index 793636a80..16334a0d8 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -7459,6 +7459,12 @@ msgstr "" "Lista de notificaciones para el servidor (no se debería cambiar esta opción, " "usar el comando /notify para ello)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: error al crear el servidor \"%s\"" diff --git a/po/fr.po b/po/fr.po index 5673377d6..54186041e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" -"PO-Revision-Date: 2016-12-04 15:00+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" +"PO-Revision-Date: 2016-12-11 13:39+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -8179,6 +8179,15 @@ msgstr "" "liste de notifications pour le serveur (vous ne devriez pas changer cette " "option mais utiliser la commande /notify)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" +"mode utilisateur à définir après la connexion au serveur et avant d'exécuter " +"la commande et de rejoindre automatiquement les canaux ; cette option donne " +"le même résultat que la définition de la commande \"/mode $nick \"" + #, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s : erreur d'ajout du serveur \"%s\"" diff --git a/po/hu.po b/po/hu.po index b41f930f5..71f19cf47 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -6645,6 +6645,12 @@ msgid "" "command instead)" msgstr "" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s nincs elég memória az információs pult üzenethez\n" diff --git a/po/it.po b/po/it.po index c72da6f9b..0b43a2e61 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -7611,6 +7611,12 @@ msgstr "" "elenco notifiche per il server (si consiglia di non cambiare questa opzione " "ma di usare il comando /notify)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: errore durante la creazione del server \"%s\"" diff --git a/po/ja.po b/po/ja.po index 46ea70866..35c9d9601 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-11-23 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \"" +msgstr "" + #, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: サーバ \"%s\" 追加中のエラー" diff --git a/po/pl.po b/po/pl.po index a84301b85..51f7f3c8d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -8007,6 +8007,12 @@ msgstr "" "lista powiadomień dla tego serwera (nie powinieneś zmieniać tej opcji tylko " "użyć w zamian komendy /notify)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: błąd podczas dodawania serwera \"%s\"" diff --git a/po/pt.po b/po/pt.po index d0e505d9a..aa3cc8440 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-27 12:29+0000\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -8008,6 +8008,12 @@ msgstr "" "lista de notificação do servidor (não deve alterar esta opção, mas sim usar " "o comando /notify)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: erro ao adicionar ao servidor \"%s\"" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2da97c590..92df7831f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -7066,6 +7066,12 @@ msgstr "" "lista de notificação para o servidor (você não deve alterar esta opção, mas " "sim utilizar o comando /notify)" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s%s: erro ao criar servidor \"%s\"" diff --git a/po/ru.po b/po/ru.po index cbe1ed108..8e69d8b81 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -6677,6 +6677,12 @@ msgid "" "command instead)" msgstr "" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%s недостаточно памяти для сообщения в строке информации\n" diff --git a/po/tr.po b/po/tr.po index 91cbe5656..8e499334f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -5975,6 +5975,12 @@ msgid "" "command instead)" msgstr "" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error adding server \"%s\"" msgstr "%sFiltre eklenirken hata" diff --git a/po/weechat.pot b/po/weechat.pot index 249ef4e94..719ce1ae5 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-12-03 09:38+0100\n" +"POT-Creation-Date: 2016-12-11 13:38+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -5899,6 +5899,12 @@ msgid "" "command instead)" msgstr "" +msgid "" +"usermode to set after connection to server and before executing command and " +"the auto-join of channels; this option gives same result as defining a " +"command \"/mode $nick \"" +msgstr "" + #, c-format msgid "%s%s: error adding server \"%s\"" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index f1c56c8e3..bab3f2e67 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -4718,6 +4718,14 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) weechat_printf (NULL, " local_hostname . . . : %s'%s'", IRC_COLOR_CHAT_VALUE, weechat_config_string (server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME])); + /* usermode */ + if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERMODE])) + weechat_printf (NULL, " usermode . . . . . . : ('%s')", + IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERMODE)); + else + weechat_printf (NULL, " usermode . . . . . . : %s'%s'", + IRC_COLOR_CHAT_VALUE, + weechat_config_string (server->options[IRC_SERVER_OPTION_USERMODE])); /* command */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_COMMAND])) { @@ -4858,14 +4866,6 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) weechat_printf (NULL, " notify . . . . . . . : %s'%s'", IRC_COLOR_CHAT_VALUE, weechat_config_string (server->options[IRC_SERVER_OPTION_NOTIFY])); - /* umodes*/ - if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_UMODES])) - weechat_printf (NULL, " umodes . . . . . . . : ('%s')", - IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_UMODES)); - else - weechat_printf (NULL, " umodes . . . . . . . : %s'%s'", - IRC_COLOR_CHAT_VALUE, - weechat_config_string (server->options[IRC_SERVER_OPTION_UMODES])); } else { diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 7370002b3..d21c76230 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -2244,12 +2244,14 @@ irc_config_server_new_option (struct t_config_file *config_file, callback_change_data, NULL, NULL, NULL); break; - case IRC_SERVER_OPTION_UMODES: + case IRC_SERVER_OPTION_USERMODE: new_option = weechat_config_new_option ( config_file, section, option_name, "string", - N_("umode(s) to set after connection to server and before " - "auto-join of channels"), + N_("usermode to set after connection to server and before " + "executing command and the auto-join of channels; this " + "option gives same result as defining a command " + "\"/mode $nick \""), NULL, 0, 0, default_value, value, null_value_allowed, diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index ba1f3eb85..d3ebf16c2 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -2453,7 +2453,7 @@ IRC_PROTOCOL_CALLBACK(wallops) IRC_PROTOCOL_CALLBACK(001) { char *server_command, **commands, **ptr_command, *vars_replaced, *away_msg; - const char *umodes; + const char *usermode; IRC_PROTOCOL_MIN_ARGS(3); @@ -2493,14 +2493,14 @@ IRC_PROTOCOL_CALLBACK(001) (void) weechat_hook_signal_send ("irc_server_connected", WEECHAT_HOOK_SIGNAL_STRING, server->name); - /* set umodes when connected */ - umodes = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_UMODES); - if (umodes && umodes[0]) + /* set usermode when connected */ + usermode = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERMODE); + if (usermode && usermode[0]) { irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, "MODE %s %s", - server->nick, umodes); + server->nick, usermode); } /* execute command when connected */ diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 5b4d80138..a0832cac6 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -102,6 +102,7 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] = { "username", "" }, { "realname", "" }, { "local_hostname", "" }, + { "usermode", "" }, { "command", "" }, { "command_delay", "0" }, { "autojoin", "" }, @@ -116,7 +117,6 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] = { "msg_part", "WeeChat ${info:version}" }, { "msg_quit", "WeeChat ${info:version}" }, { "notify", "" }, - { "umodes", "" }, }; char *irc_server_casemapping_string[IRC_SERVER_NUM_CASEMAPPING] = @@ -5522,6 +5522,9 @@ irc_server_add_to_infolist (struct t_infolist *infolist, if (!weechat_infolist_new_var_string (ptr_item, "local_hostname", IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME))) return 0; + if (!weechat_infolist_new_var_string (ptr_item, "usermode", + IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERMODE))) + return 0; if (!weechat_infolist_new_var_string (ptr_item, "command", IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_COMMAND))) return 0; @@ -5561,9 +5564,6 @@ irc_server_add_to_infolist (struct t_infolist *infolist, if (!weechat_infolist_new_var_string (ptr_item, "msg_quit", IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_QUIT))) return 0; - if (!weechat_infolist_new_var_string (ptr_item, "umodes", - IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_UMODES))) - return 0; if (!weechat_infolist_new_var_integer (ptr_item, "temp_server", server->temp_server)) return 0; if (!weechat_infolist_new_var_integer (ptr_item, "index_current_address", server->index_current_address)) @@ -5844,6 +5844,13 @@ irc_server_print_log () else weechat_log_printf (" local_hostname . . . : '%s'", weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME])); + /* usermode */ + if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_USERMODE])) + weechat_log_printf (" usermode . . . . . . : null ('%s')", + IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_USERMODE)); + else + weechat_log_printf (" usermode . . . . . . : '%s'", + weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_USERMODE])); /* command */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_COMMAND])) weechat_log_printf (" command. . . . . . . : null"); @@ -5935,13 +5942,6 @@ irc_server_print_log () else weechat_log_printf (" msg_quit . . . . . . : '%s'", weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_MSG_QUIT])); - /* umodes */ - if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_UMODES])) - weechat_log_printf (" umodes . . . . . . . : null ('%s')", - IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_UMODES)); - else - weechat_log_printf (" umodes . . . . . . . : '%s'", - weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_UMODES])); /* other server variables */ weechat_log_printf (" temp_server. . . . . : %d", ptr_server->temp_server); weechat_log_printf (" reloading_from_config: %d", ptr_server->reloaded_from_config); diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index b032b9a61..2e475bdba 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -68,6 +68,7 @@ enum t_irc_server_option IRC_SERVER_OPTION_USERNAME, /* user name */ IRC_SERVER_OPTION_REALNAME, /* real name */ IRC_SERVER_OPTION_LOCAL_HOSTNAME,/* custom local hostname */ + IRC_SERVER_OPTION_USERMODE, /* usermode to set once connected */ IRC_SERVER_OPTION_COMMAND, /* command to run once connected */ IRC_SERVER_OPTION_COMMAND_DELAY, /* delay after execution of command */ IRC_SERVER_OPTION_AUTOJOIN, /* channels to automatically join */ @@ -82,7 +83,6 @@ enum t_irc_server_option IRC_SERVER_OPTION_MSG_PART, /* default part message */ IRC_SERVER_OPTION_MSG_QUIT, /* default quit message */ IRC_SERVER_OPTION_NOTIFY, /* notify list */ - IRC_SERVER_OPTION_UMODES, /* umodes to set once connected */ /* number of server options */ IRC_SERVER_NUM_OPTIONS, };