diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer-chat.c | 55 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer.c | 14 |
3 files changed, 29 insertions, 44 deletions
@@ -1,12 +1,14 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.5-dev, 2011-01-16 +v0.3.5-dev, 2011-01-28 Version 0.3.5 (under dev!) -------------------------- +* xfer: do not close chat buffers when removing xfer from list (bug #32271) + Version 0.3.4 (2011-01-16) -------------------------- diff --git a/src/plugins/xfer/xfer-chat.c b/src/plugins/xfer/xfer-chat.c index b7fd7b89b..c2255108a 100644 --- a/src/plugins/xfer/xfer-chat.c +++ b/src/plugins/xfer/xfer-chat.c @@ -243,31 +243,25 @@ xfer_chat_buffer_input_cb (void *data, struct t_gui_buffer *buffer, ptr_xfer = xfer_search_by_buffer (buffer); - if (!ptr_xfer) + if (ptr_xfer) { - weechat_printf (NULL, - _("%s%s: can't find xfer for buffer \"%s\""), - weechat_prefix ("error"), XFER_PLUGIN_NAME, - weechat_buffer_get_string (buffer, "name")); - return WEECHAT_RC_OK; - } - - if (!XFER_HAS_ENDED(ptr_xfer->status)) - { - xfer_chat_sendf (ptr_xfer, "%s\n", input_data); if (!XFER_HAS_ENDED(ptr_xfer->status)) { - input_data_color = weechat_hook_modifier_exec ("irc_color_decode", - "1", - input_data); - weechat_printf_tags (buffer, - "irc_privmsg,no_highlight", - "%s%s\t%s", - weechat_color ("chat_nick_self"), - ptr_xfer->local_nick, - (input_data_color) ? input_data_color : input_data); - if (input_data_color) - free (input_data_color); + xfer_chat_sendf (ptr_xfer, "%s\n", input_data); + if (!XFER_HAS_ENDED(ptr_xfer->status)) + { + input_data_color = weechat_hook_modifier_exec ("irc_color_decode", + "1", + input_data); + weechat_printf_tags (buffer, + "irc_privmsg,no_highlight", + "%s%s\t%s", + weechat_color ("chat_nick_self"), + ptr_xfer->local_nick, + (input_data_color) ? input_data_color : input_data); + if (input_data_color) + free (input_data_color); + } } } @@ -344,16 +338,17 @@ xfer_chat_open_buffer (struct t_xfer *xfer) weechat_buffer_set (xfer->buffer, "localvar_set_nick", xfer->local_nick); weechat_buffer_set (xfer->buffer, "localvar_set_channel", xfer->remote_nick); weechat_buffer_set (xfer->buffer, "highlight_words_add", "$nick"); - weechat_printf (xfer->buffer, - _("Connected to %s (%d.%d.%d.%d) via " - "xfer chat"), - xfer->remote_nick, - xfer->address >> 24, - (xfer->address >> 16) & 0xff, - (xfer->address >> 8) & 0xff, - xfer->address & 0xff); } + weechat_printf (xfer->buffer, + _("Connected to %s (%d.%d.%d.%d) via " + "xfer chat"), + xfer->remote_nick, + xfer->address >> 24, + (xfer->address >> 16) & 0xff, + (xfer->address >> 8) & 0xff, + xfer->address & 0xff); + free (name); } } diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index f3bd0f100..d15dc98df 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -637,23 +637,11 @@ xfer_new (const char *plugin_name, const char *plugin_id, void xfer_free (struct t_xfer *xfer) { - struct t_xfer *new_xfer_list, *ptr_xfer; - struct t_gui_buffer *ptr_buffer; + struct t_xfer *new_xfer_list; if (!xfer) return; - if (xfer->buffer) - { - ptr_buffer = xfer->buffer; - for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer) - { - if (ptr_xfer->buffer == ptr_buffer) - ptr_xfer->buffer = NULL; - } - weechat_buffer_close (ptr_buffer); - } - /* remove xfer from list */ if (last_xfer == xfer) last_xfer = xfer->prev_xfer; |