diff options
author | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-27 20:13:35 +0200 |
---|---|---|
committer | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-27 20:13:35 +0200 |
commit | 7342a47de00b310dcc3d1f5babb99bdecb9382aa (patch) | |
tree | afe9a927d9c61fc8479d5133af2e9eb4315d1849 | |
parent | 7b053b7c40939c999b979531c567291788cb0233 (diff) | |
download | weechat-7342a47de00b310dcc3d1f5babb99bdecb9382aa.zip |
core, irc, xfer: display more information in memory allocation errors (issue #573)
-rw-r--r-- | ChangeLog.adoc | 1 | ||||
-rw-r--r-- | po/cs.po | 14 | ||||
-rw-r--r-- | po/de.po | 14 | ||||
-rw-r--r-- | po/es.po | 14 | ||||
-rw-r--r-- | po/fr.po | 16 | ||||
-rw-r--r-- | po/hu.po | 10 | ||||
-rw-r--r-- | po/it.po | 14 | ||||
-rw-r--r-- | po/ja.po | 14 | ||||
-rw-r--r-- | po/pl.po | 14 | ||||
-rw-r--r-- | po/pt.po | 14 | ||||
-rw-r--r-- | po/pt_BR.po | 14 | ||||
-rw-r--r-- | po/ru.po | 10 | ||||
-rw-r--r-- | po/tr.po | 16 | ||||
-rw-r--r-- | po/weechat.pot | 10 | ||||
-rw-r--r-- | src/core/wee-command.c | 20 | ||||
-rw-r--r-- | src/core/wee-network.c | 8 | ||||
-rw-r--r-- | src/plugins/irc/irc-server.c | 15 | ||||
-rw-r--r-- | src/plugins/xfer/xfer-network.c | 5 | ||||
-rw-r--r-- | src/plugins/xfer/xfer.c | 10 |
19 files changed, 148 insertions, 85 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index a4f2be263..a27a30b91 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -24,6 +24,7 @@ New features:: Improvements:: + * core, irc, xfer: display more information in memory allocation errors (issue #573) * relay: allow escape of comma in command "init" (weechat protocol) (issue #730) Bug fixes:: @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:42+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -291,8 +291,8 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Žádné položky pole nejsou definovány" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sNedostatek paměti" #, c-format @@ -8436,8 +8436,8 @@ msgstr "" "%s%s: měl by jste změnit volbu irc.server.%s.ssl_dhkey_size (aktuální " "hodnota je %d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: nedostatek paměti" #, c-format @@ -8617,6 +8617,10 @@ msgstr "" "buffer je vypnuto" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: nedostatek paměti" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-20 17:39+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <>\n" @@ -300,8 +300,8 @@ msgstr " %s (Erweiterung: %s)" msgid "No bar item defined" msgstr "Es wurde kein Bar-Item festgelegt" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sNicht genügend Speicher" #, c-format @@ -9728,8 +9728,8 @@ msgstr "" "verändert werden (zur Zeit genutzter Wert: %d, es sollte ein kleinerer Wert " "ausprobiert werden, z.B. %d oder %d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: nicht genügend Speicher" #, c-format @@ -9916,6 +9916,10 @@ msgstr "" "Protokollierung ist für diesen Buffer ausgeschaltet" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: nicht genügend Speicher" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:42+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -278,8 +278,8 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Ningún elemento definido" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sNo hay suficiente memoria" #, c-format @@ -8732,8 +8732,8 @@ msgstr "" "%s%s: se debería jugar con el valor de la opción irc.server.%s." "ssl_dhkey_size (el valor actual es %d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: no hay suficiente memoria" #, c-format @@ -8918,6 +8918,10 @@ msgstr "" "\"%s\", registro desactivado para este buffer" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: no hay suficiente memoria" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" -"PO-Revision-Date: 2016-05-18 07:53+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" +"PO-Revision-Date: 2016-05-27 20:10+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -290,8 +290,8 @@ msgid "No bar item defined" msgstr "Pas d'objet de barre défini" #, c-format -msgid "%sNot enough memory" -msgstr "%sPas assez de mémoire" +msgid "%sNot enough memory (%s)" +msgstr "%sPas assez de mémoire (%s)" #, c-format msgid "%sError: wrong type \"%s\" for bar \"%s\"" @@ -9490,8 +9490,8 @@ msgstr "" "valeur actuelle est %d, essayez avec une valeur plus petite comme %d ou %d)" #, c-format -msgid "%s%s: not enough memory" -msgstr "%s%s : pas assez de mémoire" +msgid "%s%s: not enough memory (%s)" +msgstr "%s%s : pas assez de mémoire (%s)" #, c-format msgid "%s%s: timeout" @@ -9671,6 +9671,10 @@ msgstr "" "\", l'enregistrement est désactivé pour ce tampon" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s : pas assez de mémoire" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -277,7 +277,7 @@ msgid "No bar item defined" msgstr "Nincs aliasz definiálva.\n" #, fuzzy, c-format -msgid "%sNot enough memory" +msgid "%sNot enough memory (%s)" msgstr "Nincs elég memória az új sorhoz\n" #, fuzzy, c-format @@ -7838,7 +7838,7 @@ msgid "" msgstr "" #, fuzzy, c-format -msgid "%s%s: not enough memory" +msgid "%s%s: not enough memory (%s)" msgstr "Nincs elég memória az új sorhoz\n" #, fuzzy, c-format @@ -8015,6 +8015,10 @@ msgid "" "for this buffer" msgstr "" +#, fuzzy, c-format +msgid "%s%s: not enough memory" +msgstr "Nincs elég memória az új sorhoz\n" + #, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -270,8 +270,8 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Nessun elemento barra definito" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sSpazio non sufficiente" #, c-format @@ -8898,8 +8898,8 @@ msgstr "" "%s%s: è necessario modificare l'opzione irc.server.%s.ssl_dhkey_size (il " "valore corrente è %d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: memoria non sufficiente" #, c-format @@ -9078,6 +9078,10 @@ msgstr "" "logging disabilitato per questo buffer" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: memoria non sufficiente" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation/ja>\n" @@ -285,8 +285,8 @@ msgstr " %s (プラグイン: %s)" msgid "No bar item defined" msgstr "バー要素が定義されていません" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sメモリ不足" #, c-format @@ -9120,8 +9120,8 @@ msgstr "" "%s%s: オプション irc.server.%s.ssl_dhkey_size をいろいろと試してください (現" "在の値は %d、%d や %d などの低い値を試してください)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: メモリが足りません" #, c-format @@ -9301,6 +9301,10 @@ msgstr "" "ています" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: メモリが足りません" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Krzysztof Korościk <soltys1@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -292,8 +292,8 @@ msgstr " %s (wtyczka: %s)" msgid "No bar item defined" msgstr "Nie zdefiniowano elementów paska" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sZa mało pamięci" #, c-format @@ -9307,8 +9307,8 @@ msgstr "" "%s%s: powinieneś zmienić wartość opcji irc.server.%s.ssl_dhkey_size (obecna " "wartość to %d, spróbuj niższej wartości jak %d lub %d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: za mało pamięci" #, c-format @@ -9487,6 +9487,10 @@ msgstr "" "bufora zostaje wyłączone" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: za mało pamięci" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -289,8 +289,8 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Nenhum item de barra definido" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sMemória insuficiente" #, c-format @@ -9311,8 +9311,8 @@ msgstr "" "%s%s: deve jogar com a opção irc.server.%s.ssl_dhkey_size (o valor atual é " "%d, tente um valor menor tal como %d ou %d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: memória insuficiente" #, c-format @@ -9495,6 +9495,10 @@ msgstr "" "registo deste buffer está desativado" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: memória insuficiente" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2def095e3..7005322ef 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -302,8 +302,8 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Nenhum item da barra definido" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sMemória insuficiente" #, c-format @@ -8261,8 +8261,8 @@ msgstr "" "%s%s: você deve alterar a opção irc.server.%s.ssl_dhkey_size (valor atual é " "%d)" -#, c-format -msgid "%s%s: not enough memory" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" msgstr "%s%s: memória insuficiente" #, fuzzy, c-format @@ -8446,6 +8446,10 @@ msgstr "" "\"%s\", o registro está desabilitado para este buffer" #, c-format +msgid "%s%s: not enough memory" +msgstr "%s%s: memória insuficiente" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -286,7 +286,7 @@ msgid "No bar item defined" msgstr "Сокращения не заданы.\n" #, fuzzy, c-format -msgid "%sNot enough memory" +msgid "%sNot enough memory (%s)" msgstr "Недостаточно памяти для новой строчки\n" #, fuzzy, c-format @@ -7875,7 +7875,7 @@ msgid "" msgstr "" #, fuzzy, c-format -msgid "%s%s: not enough memory" +msgid "%s%s: not enough memory (%s)" msgstr "Недостаточно памяти для новой строчки\n" #, fuzzy, c-format @@ -8049,6 +8049,10 @@ msgid "" "for this buffer" msgstr "" +#, fuzzy, c-format +msgid "%s%s: not enough memory" +msgstr "Недостаточно памяти для новой строчки\n" + #, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -242,8 +242,8 @@ msgstr " %s (eklenti: %s)" msgid "No bar item defined" msgstr "" -#, c-format -msgid "%sNot enough memory" +#, fuzzy, c-format +msgid "%sNot enough memory (%s)" msgstr "%sYeterli bellek yok" #, c-format @@ -7097,9 +7097,9 @@ msgid "" "value is %d, try a lower value like %d or %d)" msgstr "" -#, c-format -msgid "%s%s: not enough memory" -msgstr "" +#, fuzzy, c-format +msgid "%s%s: not enough memory (%s)" +msgstr "%sYeterli bellek yok" #, c-format msgid "%s%s: timeout" @@ -7268,6 +7268,10 @@ msgid "" msgstr "" #, c-format +msgid "%s%s: not enough memory" +msgstr "" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" diff --git a/po/weechat.pot b/po/weechat.pot index c838fa805..ef2d0bf20 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-05-18 07:50+0200\n" +"POT-Creation-Date: 2016-05-27 20:09+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -240,7 +240,7 @@ msgid "No bar item defined" msgstr "" #, c-format -msgid "%sNot enough memory" +msgid "%sNot enough memory (%s)" msgstr "" #, c-format @@ -7022,7 +7022,7 @@ msgid "" msgstr "" #, c-format -msgid "%s%s: not enough memory" +msgid "%s%s: not enough memory (%s)" msgstr "" #, c-format @@ -7193,6 +7193,10 @@ msgid "" msgstr "" #, c-format +msgid "%s%s: not enough memory" +msgstr "" + +#, c-format msgid "" "%s%s: unable to start logging for buffer \"%s\": filename \"%s\" is already " "used by another buffer (check your log settings)" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index ac6bd6ce6..a55aa0055 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -239,8 +239,9 @@ COMMAND_CALLBACK(bar) if (!str_type) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/bar"); return WEECHAT_RC_OK; } type = gui_bar_search_type (str_type); @@ -5081,8 +5082,9 @@ COMMAND_CALLBACK(repeat) if (!repeat_args) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/repeat"); return WEECHAT_RC_OK; } repeat_args[0] = strdup (buffer->full_name); @@ -6040,8 +6042,9 @@ COMMAND_CALLBACK(upgrade) if (!ptr_binary && !quit) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/upgrade"); return WEECHAT_RC_OK; } @@ -6400,8 +6403,9 @@ COMMAND_CALLBACK(wait) if (!timer_args) { gui_chat_printf (NULL, - _("%sNot enough memory"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + _("%sNot enough memory (%s)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + "/wait"); return WEECHAT_RC_OK; } timer_args[0] = strdup (buffer->full_name); diff --git a/src/core/wee-network.c b/src/core/wee-network.c index fd1474236..cb2fa52d2 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -1609,7 +1609,7 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, sock, cb_error, cb_ip_address); + 0, sock, "child_read_cb", NULL); unhook (hook_connect); } @@ -1695,7 +1695,7 @@ network_connect_with_fork (struct t_hook *hook_connect) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, -1, NULL, NULL); + 0, -1, "pipe", NULL); unhook (hook_connect); return; } @@ -1710,7 +1710,7 @@ network_connect_with_fork (struct t_hook *hook_connect) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, -1, NULL, NULL); + 0, -1, "socketpair", NULL); unhook (hook_connect); return; } @@ -1732,7 +1732,7 @@ network_connect_with_fork (struct t_hook *hook_connect) (hook_connect->callback_pointer, hook_connect->callback_data, WEECHAT_HOOK_CONNECT_MEMORY_ERROR, - 0, -1, NULL, NULL); + 0, -1, "fork", NULL); unhook (hook_connect); return; /* child process */ diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 7d8ce2edd..9e7580584 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -3618,8 +3618,9 @@ irc_server_connect_cb (const void *pointer, void *data, case WEECHAT_HOOK_CONNECT_MEMORY_ERROR: weechat_printf ( server->buffer, - _("%s%s: not enough memory"), - weechat_prefix ("error"), IRC_PLUGIN_NAME); + _("%s%s: not enough memory (%s)"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, + (error) ? error : "-"); if (error && error[0]) { weechat_printf ( @@ -3939,8 +3940,9 @@ irc_server_check_certificate_fingerprint (struct t_irc_server *server, { weechat_printf ( server->buffer, - _("%s%s: not enough memory"), - weechat_prefix ("error"), IRC_PLUGIN_NAME); + _("%s%s: not enough memory (%s)"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, + "fingerprint"); } } @@ -4432,8 +4434,9 @@ irc_server_connect (struct t_irc_server *server) { weechat_printf ( server->buffer, - _("%s%s: not enough memory"), - weechat_prefix ("error"), IRC_PLUGIN_NAME); + _("%s%s: not enough memory (%s)"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, + "proxy"); return 0; } snprintf (option_name, length, "weechat.proxy.%s.type", proxy); diff --git a/src/plugins/xfer/xfer-network.c b/src/plugins/xfer/xfer-network.c index f52345dee..a6871376d 100644 --- a/src/plugins/xfer/xfer-network.c +++ b/src/plugins/xfer/xfer-network.c @@ -620,8 +620,9 @@ xfer_network_connect_chat_recv_cb (const void *pointer, void *data, break; case WEECHAT_HOOK_CONNECT_MEMORY_ERROR: weechat_printf (NULL, - _("%s%s: not enough memory"), - weechat_prefix ("error"), XFER_PLUGIN_NAME); + _("%s%s: not enough memory (%s)"), + weechat_prefix ("error"), XFER_PLUGIN_NAME, + (error) ? error : "-"); break; case WEECHAT_HOOK_CONNECT_TIMEOUT: weechat_printf (NULL, diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index fb7d5ff52..25b855124 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -1119,16 +1119,18 @@ xfer_add_cb (const void *pointer, void *data, if (!path) { weechat_printf (NULL, - _("%s%s: not enough memory"), - weechat_prefix ("error"), XFER_PLUGIN_NAME); + _("%s%s: not enough memory (%s)"), + weechat_prefix ("error"), XFER_PLUGIN_NAME, + "xfer_add, path"); goto error; } filename2 = malloc (strlen (path) + strlen (filename) + 4); if (!filename2) { weechat_printf (NULL, - _("%s%s: not enough memory"), - weechat_prefix ("error"), XFER_PLUGIN_NAME); + _("%s%s: not enough memory (%s)"), + weechat_prefix ("error"), XFER_PLUGIN_NAME, + "xfer_add, filename2"); free (path); goto error; } |