diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2012-09-03 09:43:38 +0200 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2012-09-03 09:43:38 +0200 |
| commit | 606be401ccd6cc69b21541e679954a7bdc1ad5b5 (patch) | |
| tree | c18f952c6a522e26ad0409684101db442a3c0873 /src/plugins/irc | |
| parent | 4979c1fe7f54766122f00c05c86ec11566557fe2 (diff) | |
| download | weechat-606be401ccd6cc69b21541e679954a7bdc1ad5b5.zip | |
irc: add network prefix in some irc/gnutls messages
Diffstat (limited to 'src/plugins/irc')
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 32 |
2 files changed, 24 insertions, 11 deletions
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 63eb36f54..730d5b86c 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -4159,8 +4159,9 @@ IRC_PROTOCOL_CALLBACK(433) } weechat_printf (ptr_buffer, - _("%s: nickname \"%s\" is already in use, " + _("%s%s: nickname \"%s\" is already in use, " "trying nickname \"%s\""), + weechat_prefix ("network"), IRC_PLUGIN_NAME, server->nick, alternate_nick); irc_server_set_nick (server, alternate_nick); diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index e6a8fc179..ad0936cad 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -2952,7 +2952,8 @@ irc_server_switch_address (struct t_irc_server *server, int connection) irc_server_set_index_current_address (server, (server->index_current_address + 1) % server->addresses_count); weechat_printf (server->buffer, - _("%s: switching address to %s/%d"), + _("%s%s: switching address to %s/%d"), + weechat_prefix ("network"), IRC_PLUGIN_NAME, server->current_address, server->current_port); @@ -3330,8 +3331,9 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session, if (action == WEECHAT_HOOK_CONNECT_GNUTLS_CB_VERIFY_CERT) { weechat_printf (server->buffer, - _("gnutls: connected using %d-bit Diffie-Hellman shared " + _("%sgnutls: connected using %d-bit Diffie-Hellman shared " "secret exchange"), + weechat_prefix ("network"), IRC_SERVER_OPTION_INTEGER (server, IRC_SERVER_OPTION_SSL_DHKEY_SIZE)); if (gnutls_certificate_verify_peers2 (tls_session, &status) < 0) @@ -3354,7 +3356,8 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session, else { weechat_printf (server->buffer, - _("gnutls: peer's certificate is trusted")); + _("%sgnutls: peer's certificate is trusted"), + weechat_prefix ("network")); } if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) { @@ -3378,9 +3381,10 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session, if (cert_list) { weechat_printf (server->buffer, - NG_("gnutls: receiving %d certificate", - "gnutls: receiving %d certificates", + NG_("%sgnutls: receiving %d certificate", + "%sgnutls: receiving %d certificates", cert_list_len), + weechat_prefix ("network"), cert_list_len); for (i = 0, j = (int) cert_list_len; i < j; i++) { @@ -3401,9 +3405,13 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session, if (rinfo == 0) { weechat_printf (server->buffer, - _(" - certificate[%d] info:"), i + 1); + _("%s - certificate[%d] info:"), + weechat_prefix ("network"), + i + 1); weechat_printf (server->buffer, - " - %s", cinfo.data); + "%s - %s", + weechat_prefix ("network"), + cinfo.data); gnutls_free (cinfo.data); } #endif @@ -3457,7 +3465,8 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session, if (cert_str) { weechat_printf (server->buffer, - _("gnutls: sending one certificate")); + _("%sgnutls: sending one certificate"), + weechat_prefix ("network")); filedatum.data = (unsigned char *) cert_str; filedatum.size = strlen (cert_str); @@ -3516,9 +3525,12 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session, if (rinfo == 0) { weechat_printf (server->buffer, - _(" - client certificate info (%s):"), + _("%s - client certificate info (%s):"), + weechat_prefix ("network"), cert_path2); - weechat_printf (server->buffer, " - %s", cinfo.data); + weechat_printf (server->buffer, "%s - %s", + weechat_prefix ("network"), + cinfo.data); gnutls_free (cinfo.data); } #endif |