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:: diff --git a/po/cs.po b/po/cs.po index c973909c0..f8c6661d7 100644 --- a/po/cs.po +++ b/po/cs.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:42+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \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 @@ -8616,6 +8616,10 @@ msgstr "" "%s%s: nemohu najít jméno souboru masky pro buffer \"%s\", logování pro tento " "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 " diff --git a/po/de.po b/po/de.po index d2a6e4f9f..7221fb095 100644 --- a/po/de.po +++ b/po/de.po @@ -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 \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 @@ -9915,6 +9915,10 @@ msgstr "" "%s%s: Es existiert keine Dateinamen-Maske für den Buffer \"%s\", " "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 " diff --git a/po/es.po b/po/es.po index 19f83a641..ac29239fb 100644 --- a/po/es.po +++ b/po/es.po @@ -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 \n" "Language-Team: weechat-dev \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 @@ -8917,6 +8917,10 @@ msgstr "" "%s%s: imposible encontrar la máscara del nombre del archivo para el buffer " "\"%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 " diff --git a/po/fr.po b/po/fr.po index 7534ae943..1939831e3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 \n" "Language-Team: weechat-dev \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" @@ -9670,6 +9670,10 @@ msgstr "" "%s%s : impossible de trouver le masque de nom de fichier pour le tampon \"%s" "\", 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 " diff --git a/po/hu.po b/po/hu.po index eafdfbef5..24e2cac7e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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 \n" "Language-Team: weechat-dev \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 " diff --git a/po/it.po b/po/it.po index c4b5556d0..0cbc44bba 100644 --- a/po/it.po +++ b/po/it.po @@ -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 \n" "Language-Team: weechat-dev \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 @@ -9077,6 +9077,10 @@ msgstr "" "%s%s: impossibile trovare la mask del nome del file per il buffer \"%s\", " "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 " diff --git a/po/ja.po b/po/ja.po index 6aa395f9b..77051247a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 \n" "Language-Team: Japanese \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 @@ -9300,6 +9300,10 @@ msgstr "" "%s%s: バッファ \"%s\" のファイル名マスクが見つかりません、ログ保存を無効化し" "ています" +#, 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 " diff --git a/po/pl.po b/po/pl.po index 780388fb1..fecda7f47 100644 --- a/po/pl.po +++ b/po/pl.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: Krzysztof Korościk \n" "Language-Team: weechat-dev \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 @@ -9486,6 +9486,10 @@ msgstr "" "%s%s: nie można odnaleźć maski pliku dla bufora \"%s\", logowanie dla tego " "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 " diff --git a/po/pt.po b/po/pt.po index b55a54b79..a0cabe5e7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -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 \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 @@ -9494,6 +9494,10 @@ msgstr "" "%s%s: não foi possível encontrar máscara de ficheiro do buffer \"%s\", o " "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 " 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 \n" "Language-Team: weechat-dev \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 @@ -8445,6 +8445,10 @@ msgstr "" "%s%s: não foi possível encontrar máscara de nome de arquigo para o buffer " "\"%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 " diff --git a/po/ru.po b/po/ru.po index 31a7cf47e..fb54d6cef 100644 --- a/po/ru.po +++ b/po/ru.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: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \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 " diff --git a/po/tr.po b/po/tr.po index e4883cf44..c1f364cd8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 \n" "Language-Team: weechat-dev \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" @@ -7267,6 +7267,10 @@ msgid "" "for this buffer" 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 " 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 \n" "Language-Team: weechat-dev \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 @@ -7192,6 +7192,10 @@ msgid "" "for this buffer" 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 " 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; }