diff options
| author | nils_2 <weechatter@arcor.de> | 2014-05-06 22:13:22 +0200 |
|---|---|---|
| committer | nils_2 <weechatter@arcor.de> | 2014-05-06 22:13:22 +0200 |
| commit | ee8e551b7cc7f560ae7b6b7a0518e8124ceeba79 (patch) | |
| tree | af09f9a7d5468861960b4f821ee12ab76a4ea9ad | |
| parent | 7d58491b4a9db5b35c9a5f7cc51d9e025051d3ff (diff) | |
| parent | a54566df2e37cc5fac70d8bbd5df72911a5c52e6 (diff) | |
| download | weechat-ee8e551b7cc7f560ae7b6b7a0518e8124ceeba79.zip | |
Merge branch 'master' of https://github.com/weechat/weechat
| -rw-r--r-- | ChangeLog.asciidoc | 2 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 9440d4e68..4236df06e 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -139,6 +139,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * scripts: fix crash when a signal is received with type "int" and NULL pointer in signal_data * trigger: add trigger plugin: new command /trigger and file trigger.conf +* xfer: fix problem with option xfer.file.auto_accept_nicks when the server + name contains dots * xfer: fix freeze/problems when sending empty files with DCC (closes #53) * xfer: fix connection to remote host in DCC receive on Mac OS X (closes #25) * xfer: remove bind on xfer.network.own_ip (closes #5) diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index 4d8ec2615..0839eafd9 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -527,7 +527,7 @@ xfer_nick_auto_accepted (const char *server, const char *nick) { for (i = 0; i < num_nicks; i++) { - pos = strchr (nicks[i], '.'); + pos = strrchr (nicks[i], '.'); if (pos) { if ((weechat_strncasecmp (server, nicks[i], pos - nicks[i]) == 0) |