diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2014-11-23 15:09:59 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2014-11-23 15:09:59 +0100 |
| commit | afef4b0d8a652ee60270a8a12fdbc8df7841cdaf (patch) | |
| tree | 60f8ad6a9caeb97811e94a22ed8e8c50fb246fdd /src/plugins | |
| parent | c2dc541d0d0c69b814e670df08ed1852d456afd1 (diff) | |
| download | weechat-afef4b0d8a652ee60270a8a12fdbc8df7841cdaf.zip | |
irc: add missing server options "sasl_timeout", "sasl_fail" and "notify" in output of /server listfull
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/irc/irc-command.c | 26 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.h | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 46a885bfd..96e12d22d 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -4440,6 +4440,24 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) weechat_printf (NULL, " sasl_password. . . . : %s%s", IRC_COLOR_CHAT_VALUE, _("(hidden)")); + /* sasl_timeout */ + if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_TIMEOUT])) + weechat_printf (NULL, " sasl_timeout . . . . : (%d %s)", + IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_TIMEOUT), + NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_TIMEOUT))); + else + weechat_printf (NULL, " sasl_timeout . . . . : %s%d %s", + IRC_COLOR_CHAT_VALUE, + weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_TIMEOUT]), + NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_TIMEOUT]))); + /* sasl_fail */ + if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_FAIL])) + weechat_printf (NULL, " sasl_fail. . . . . . : ('%s')", + irc_server_sasl_fail_string[IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_FAIL)]); + else + weechat_printf (NULL, " sasl_fail. . . . . . : %s'%s'", + IRC_COLOR_CHAT_VALUE, + irc_server_sasl_fail_string[weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_FAIL])]); /* autoconnect */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOCONNECT])) weechat_printf (NULL, " autoconnect. . . . . : (%s)", @@ -4634,6 +4652,14 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) weechat_printf (NULL, " default_msg_quit . . : %s'%s'", IRC_COLOR_CHAT_VALUE, weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT])); + /* notify */ + if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NOTIFY])) + weechat_printf (NULL, " notify . . . . . . . : ('%s')", + IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_NOTIFY)); + else + weechat_printf (NULL, " notify . . . . . . . : %s'%s'", + IRC_COLOR_CHAT_VALUE, + weechat_config_string (server->options[IRC_SERVER_OPTION_NOTIFY])); } else { diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index d722db496..3a2aad4d3 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -245,6 +245,7 @@ extern const int gnutls_cert_type_prio[]; extern const int gnutls_prot_prio[]; #endif extern struct t_irc_message *irc_recv_msgq, *irc_msgq_last_msg; +extern char *irc_server_sasl_fail_string[]; extern char *irc_server_options[][2]; extern int irc_server_valid (struct t_irc_server *server); |