xfer: display origin of xfer in core and xfer buffers (task #10956)

13 files changed, 129 insertions, 85 deletions

diff --git a/ChangeLog b/ChangeLog
index ec62ecb3c..1bb0f55fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7-dev, 2011-11-18
+v0.3.7-dev, 2011-11-19
 
 
 Version 0.3.7 (under dev!)
@@ -45,6 +45,7 @@ Version 0.3.7 (under dev!)
   other servers if "-a" ("--no-connect") is given
 * guile: new script plugin for scheme (task #7289)
 * ruby: fix crash when reloading ruby plugin (bug #34474)
+* xfer: display origin of xfer in core and xfer buffers (task #10956)
 
 Version 0.3.6 (2011-10-22)
 --------------------------
diff --git a/po/cs.po b/po/cs.po
index 04c3d34a7..da5c7aa44 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-11-03 16:57+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7834,23 +7834,26 @@ msgstr "%s: rozhovor zavřen s %s (%d.%d.%d.%d)"
 msgid "%s%s: not enough memory for new xfer"
 msgstr "%s%s: nedostatek paměti pro nový xfer"
 
-#, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+#, fuzzy, c-format
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr "%s: příchozí soubor od %s (%d.%d.%d.%d): %s, %llu bytů (protokol: %s)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: posílám soubor k %s: %s (lokální jméno souboru: %s), %llu bytů "
 "(protokol: %s)"
 
-#, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "%s: příchozí požadavek rozhovoru od %s (%d.%d.%d.%d)"
 
-#, c-format
-msgid "%s: sending chat request to %s"
+#, fuzzy, c-format
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "%s: posílám požadavek rozhovoru na %s"
 
 #, c-format
diff --git a/po/de.po b/po/de.po
index 34eef6a41..fbc13347f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-11-08 22:03+0100\n"
 "Last-Translator: Nils Görs\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8269,23 +8269,26 @@ msgid "%s%s: not enough memory for new xfer"
 msgstr ""
 "%s%s: Für einen neuen Transfer steht nicht ausreichend Speicher zur Verfügung"
 
-#, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+#, fuzzy, c-format
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: eingehende Datei von %s (%d.%d.%d.%d): %s, %llu Bytes (Protokoll: %s)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: Sende Datei an %s: %s (lokaler Dateiname: %s), %llu Bytes (Protokoll: %s)"
 
-#, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "%s: eingehende Chatanforderung von %s (%d.%d.%d.%d)"
 
-#, c-format
-msgid "%s: sending chat request to %s"
+#, fuzzy, c-format
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "%s: Sende Chatanforderung an: %s"
 
 #, c-format
diff --git a/po/es.po b/po/es.po
index dd1e025c6..b49426131 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-11-03 16:57+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8037,24 +8037,27 @@ msgstr "%s: charla con %s cerrada (%d.%d.%d.%d)"
 msgid "%s%s: not enough memory for new xfer"
 msgstr "%s%s: no hay memoria suficiente para una nueva transferencia"
 
-#, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+#, fuzzy, c-format
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: archivo entrante desde %s (%d.%d.%d.%d): %s, %llu bytes (protocolo: %s)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: enviando archivo a %s: %s (nombre del archivo local: %s), %llu bytes "
 "(protocolo: %s)"
 
-#, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "%s: petición de charla desde %s (%d.%d.%d.%d)"
 
-#, c-format
-msgid "%s: sending chat request to %s"
+#, fuzzy, c-format
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "%s: petición de charla enviada a %s"
 
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 9288deb4f..bf40fcf1d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
-"PO-Revision-Date: 2011-11-15 11:44+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
+"PO-Revision-Date: 2011-11-19 11:25+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -8099,23 +8099,28 @@ msgid "%s%s: not enough memory for new xfer"
 msgstr "%s%s: pas assez de mémoire pour un nouveau xfer"
 
 #, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
-"%s: réception fichier de %s (%d.%d.%d.%d): %s, %llu octets (protocole: %s)"
+"%s: réception fichier de %s (%s.%s), ip: %d.%d.%d.%d, nom: %s, %llu octets "
+"(protocole: %s)"
 
 #, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
-"%s: envoi fichier à %s: %s (nom local: %s), %llu octets (protocole: %s)"
+"%s: envoi fichier à %s (%s.%s): %s (nom local: %s), %llu octets (protocole: "
+"%s)"
 
 #, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
-msgstr "%s: demande de discussion reçue de %s (%d.%d.%d.%d)"
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+msgstr "%s: demande de discussion reçue de %s (%s.%s), ip: %d.%d.%d.%d"
 
 #, c-format
-msgid "%s: sending chat request to %s"
-msgstr "%s: envoi d'une demande de discussion à %s"
+msgid "%s: sending chat request to %s (%s.%s)"
+msgstr "%s: envoi d'une demande de discussion à %s (%s.%s)"
 
 #, c-format
 msgid "%s: file %s (local filename: %s) will be resumed at position %llu"
diff --git a/po/hu.po b/po/hu.po
index 238f3aa41..b32cdf727 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-10-22 12:21+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7355,24 +7355,27 @@ msgid "%s%s: not enough memory for new xfer"
 msgstr "%s nincs elegendő memória új DCC számára\n"
 
 #, fuzzy, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "Beérkező DCC fájl a következőtől: %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu"
 "%s bájt\n"
 
 #, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "DCC fájl küldése a következőnek: %s%s%s: %s%s%s (helyi fájlnév: %s%s%s), %s"
 "%lu%s bájt\n"
 
 #, fuzzy, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "Beérkező DCC beszélgetés a következőtől: %s%s%s (%s%d.%d.%d.%d%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: sending chat request to %s"
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "DCC beszélgetésre felkérés küldése a következőnek: %s%s\n"
 
 #, fuzzy, c-format
diff --git a/po/it.po b/po/it.po
index 62f950fd6..f2ed394be 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-17 13:28+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-11-15 19:37+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8031,22 +8031,25 @@ msgstr "%s: chat con %s (%d.%d.%d.%d) chiusa"
 msgid "%s%s: not enough memory for new xfer"
 msgstr "%s%s: memoria non sufficiente per nuovo xfer"
 
-#, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+#, fuzzy, c-format
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr "%s: file in arrivo da %s (%d.%d.%d.%d): %s, %llu byte (protocollo: %s)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: invio file a %s: %s (nome file locale: %s), %llu byte (protocollo: %s)"
 
-#, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "%s: richiesta di chat in arrivo da %s (%d.%d.%d.%d)"
 
-#, c-format
-msgid "%s: sending chat request to %s"
+#, fuzzy, c-format
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "%s: invio richiesta di chat a %s"
 
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 1504dd7b2..175f37a52 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-11-03 16:57+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7959,23 +7959,26 @@ msgstr "%s: rozmowa zakończona z %s (%d.%d.%d.%d)"
 msgid "%s%s: not enough memory for new xfer"
 msgstr "%s%s: za mało pamięci na nowy xfer"
 
-#, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+#, fuzzy, c-format
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: pobieranie pliku od %s (%d.%d.%d.%d): %s, %llu bajtów (protokół: %s)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 "%s: wysyłanie pliku do %s: %s (lokalna nazwa: %s), %llu bajtów (protokół: %s)"
 
-#, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "%s: żądanie rozmowy od %s (%d.%d.%d.%d)"
 
-#, c-format
-msgid "%s: sending chat request to %s"
+#, fuzzy, c-format
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "%s: wysyłam żądanie rozmowy do %s"
 
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f46eab97..888232b47 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-11-03 16:58+0100\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7291,20 +7291,23 @@ msgid "%s%s: not enough memory for new xfer"
 msgstr ""
 
 #, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 
 #, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr ""
 
 #, c-format
-msgid "%s: sending chat request to %s"
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr ""
 
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index f1e773cfe..8e47855f8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: 2011-10-22 12:21+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7367,20 +7367,23 @@ msgid "%s%s: not enough memory for new xfer"
 msgstr "%s недостаточно памяти для нового DCC\n"
 
 #, fuzzy, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr "Входящий файл от %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s байт\n"
 
 #, fuzzy, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr "Отправляю файл %s%s%s: %s%s%s (файл: %s%s%s), %s%lu%s байт\n"
 
 #, fuzzy, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr "Входящий запрос на DCC-чат от %s%s%s (%s%d.%d.%d.%d%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: sending chat request to %s"
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr "Отправляю запрос на DCC-чат %s%s\n"
 
 #, fuzzy, c-format
diff --git a/po/weechat.pot b/po/weechat.pot
index b7cdaab08..e5be331f7 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-15 11:43+0100\n"
+"POT-Creation-Date: 2011-11-19 11:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6460,20 +6460,23 @@ msgid "%s%s: not enough memory for new xfer"
 msgstr ""
 
 #, c-format
-msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %llu bytes (protocol: %s)"
+msgid ""
+"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"(protocol: %s)"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: sending file to %s: %s (local filename: %s), %llu bytes (protocol: %s)"
+"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"(protocol: %s)"
 msgstr ""
 
 #, c-format
-msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
+msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
 msgstr ""
 
 #, c-format
-msgid "%s: sending chat request to %s"
+msgid "%s: sending chat request to %s (%s.%s)"
 msgstr ""
 
 #, c-format
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: