diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/xfer/xfer-buffer.c | 8 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer.c | 21 |
2 files changed, 20 insertions, 9 deletions
diff --git a/src/plugins/xfer/xfer-buffer.c b/src/plugins/xfer/xfer-buffer.c index 684406970..f1cbfe592 100644 --- a/src/plugins/xfer/xfer-buffer.c +++ b/src/plugins/xfer/xfer-buffer.c @@ -93,9 +93,9 @@ xfer_buffer_refresh (const char *hotlist) weechat_config_string (xfer_config_color_text), weechat_config_string (xfer_config_color_text_bg)); - /* display first line with remote nick and filename */ + /* display first line with remote nick, filename and plugin name/id */ weechat_printf_y (xfer_buffer, (line * 2) + 2, - "%s%s%-24s %s%s%s%s", + "%s%s%-24s %s%s%s%s (%s.%s)", weechat_color(str_color), (line == xfer_buffer_selected_line) ? "*** " : " ", @@ -104,7 +104,9 @@ xfer_buffer_refresh (const char *hotlist) (XFER_IS_FILE(ptr_xfer->type)) ? ptr_xfer->filename : _("xfer chat"), (XFER_IS_FILE(ptr_xfer->type)) ? "\"" : "", - suffix); + suffix, + ptr_xfer->plugin_name, + ptr_xfer->plugin_id); snprintf (status, sizeof (status), "%s", _(xfer_status_string[ptr_xfer->status])); diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index 7d84d0b63..520265cb4 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -536,15 +536,18 @@ xfer_new (const char *plugin_name, const char *plugin_id, else xfer_file_find_filename (new_xfer); - /* write info message on server buffer */ + /* write info message on core buffer */ switch (type) { case XFER_TYPE_FILE_RECV: weechat_printf (NULL, _("%s: incoming file from %s " - "(%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"), + "(%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes " + "(protocol: %s)"), XFER_PLUGIN_NAME, remote_nick, + plugin_name, + plugin_id, address >> 24, (address >> 16) & 0xff, (address >> 8) & 0xff, @@ -556,10 +559,12 @@ xfer_new (const char *plugin_name, const char *plugin_id, break; case XFER_TYPE_FILE_SEND: weechat_printf (NULL, - _("%s: sending file to %s: %s " + _("%s: sending file to %s (%s.%s): %s " "(local filename: %s), %llu bytes (protocol: %s)"), XFER_PLUGIN_NAME, remote_nick, + plugin_name, + plugin_id, filename, local_filename, size, @@ -569,9 +574,11 @@ xfer_new (const char *plugin_name, const char *plugin_id, case XFER_TYPE_CHAT_RECV: weechat_printf (NULL, _("%s: incoming chat request from %s " - "(%d.%d.%d.%d)"), + "(%s.%s), ip: %d.%d.%d.%d"), XFER_PLUGIN_NAME, remote_nick, + plugin_name, + plugin_id, address >> 24, (address >> 16) & 0xff, (address >> 8) & 0xff, @@ -580,9 +587,11 @@ xfer_new (const char *plugin_name, const char *plugin_id, break; case XFER_TYPE_CHAT_SEND: weechat_printf (NULL, - _("%s: sending chat request to %s"), + _("%s: sending chat request to %s (%s.%s)"), XFER_PLUGIN_NAME, - remote_nick); + remote_nick, + plugin_name, + plugin_id); xfer_buffer_refresh (WEECHAT_HOTLIST_MESSAGE); break; case XFER_NUM_TYPES: |