diff options
| -rw-r--r-- | po/cs.po | 52 | ||||
| -rw-r--r-- | po/es.po | 52 | ||||
| -rw-r--r-- | po/fr.po | 52 | ||||
| -rw-r--r-- | po/weechat.pot | 52 | ||||
| -rw-r--r-- | src/plugins/plugins-interface.c | 18 | ||||
| -rw-r--r-- | src/plugins/scripts/perl/weechat-perl.c | 27 | ||||
| -rw-r--r-- | src/plugins/scripts/python/weechat-python.c | 4 | ||||
| -rw-r--r-- | src/plugins/scripts/ruby/weechat-ruby.c | 4 | ||||
| -rw-r--r-- | src/plugins/weechat-plugin.h | 8 | ||||
| -rw-r--r-- | weechat/po/cs.po | 52 | ||||
| -rw-r--r-- | weechat/po/es.po | 52 | ||||
| -rw-r--r-- | weechat/po/fr.po | 52 | ||||
| -rw-r--r-- | weechat/po/weechat.pot | 52 | ||||
| -rw-r--r-- | weechat/src/plugins/plugins-interface.c | 18 | ||||
| -rw-r--r-- | weechat/src/plugins/scripts/perl/weechat-perl.c | 27 | ||||
| -rw-r--r-- | weechat/src/plugins/scripts/python/weechat-python.c | 4 | ||||
| -rw-r--r-- | weechat/src/plugins/scripts/ruby/weechat-ruby.c | 4 | ||||
| -rw-r--r-- | weechat/src/plugins/weechat-plugin.h | 8 |
18 files changed, 280 insertions, 258 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+0100\n" "PO-Revision-Date: 2006-01-24 19:25+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2191,32 +2191,32 @@ msgstr "" "%s funkce \"weechat_plugin_init\" nebyla v pluginu \"%s\" nalezena, načtení " "selhalo\n" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "Inicializuji plugin \"%s\" %s\n" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "%s nemohu načíst plugin \"%s\"\n" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "%s nemohu načíst plugin \"%s\" (nedostatek paměti)\n" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "Plugin \"%s\" (%s) načten.\n" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" odebrán.\n" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" nenalezen\n" @@ -2272,80 +2272,80 @@ msgstr "Změnil se den na %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "bajtů" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "Kb" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "Mb" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "Gb" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "<serverů>" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "-VÍCE-" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "server" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "Nedostatek paměti pro infobar zprávu\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+0100\n" "PO-Revision-Date: 2006-01-24 19:24+0100\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2211,33 +2211,33 @@ msgstr "" "%s funcin \"weechat_plugin_init\" no encontrada en el plugin \"%s\", fall " "al cargar\n" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "Inicializando plugin \"%s\" %s\n" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "%s no ha sido posible inicializar el plugin \"%s\"\n" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "" "%s no ha sido posible cargar el plugin \"%s\" (no hay suficiente memoria)\n" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "Plugin \"%s\" (%s) cargado.\n" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" descargado.\n" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" no encontrado\n" @@ -2293,80 +2293,80 @@ msgstr "Da cambiado a %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "bytes" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "KB" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "MB" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "GB" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "Tiempo estimado de llegada" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "<servidores>" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "-MS-" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "servidor" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de informacin\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+0100\n" "PO-Revision-Date: 2006-01-30 21:05+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2208,32 +2208,32 @@ msgstr "" "%s la fonction \"weechat_plugin_init\" est introuvable dans l'extension \"%s" "\", chec de chargement\n" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "Initialisation de l'extension \"%s\" %s\n" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "%s impossible d'initialiser l'extension \"%s\"\n" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "%s impossible de charger l'extension \"%s\" (mmoire insuffisante)\n" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "Extension \"%s\" (%s) charge.\n" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "Extension \"%s\" dcharge.\n" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s extension \"%s\" non trouve\n" @@ -2291,80 +2291,80 @@ msgstr "Jour chang: %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s le lag est lev, dconnexion du serveur...\n" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "octets" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "Ko" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "Mo" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "Go" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "<serveurs>" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "-PLUS-" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "Pas assez de mmoire pour un message de la barre d'infos\n" diff --git a/po/weechat.pot b/po/weechat.pot index b9334639e..1797e7a11 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: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+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" @@ -2053,32 +2053,32 @@ msgid "" "load\n" msgstr "" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "" @@ -2129,80 +2129,80 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "" -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr "" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr "" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr "" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "" diff --git a/src/plugins/plugins-interface.c b/src/plugins/plugins-interface.c index 6d131e844..cb7a0cfdf 100644 --- a/src/plugins/plugins-interface.c +++ b/src/plugins/plugins-interface.c @@ -715,14 +715,14 @@ weechat_plugin_get_server_info (t_weechat_plugin *plugin) new_server_info->away_time = ptr_server->away_time; new_server_info->lag = ptr_server->lag; - new_server_info->prev_info = last_server_info; - new_server_info->next_info = NULL; + new_server_info->prev_server = last_server_info; + new_server_info->next_server = NULL; if (!server_info) server_info = new_server_info; else - last_server_info->next_info = new_server_info; + last_server_info->next_server = new_server_info; last_server_info = new_server_info; - } + } } return server_info; @@ -775,7 +775,7 @@ weechat_plugin_free_server_info (t_weechat_plugin *plugin, t_plugin_server_info free (server_info->charset_encode); if (server_info->nick) free (server_info->nick); - new_server_info = server_info->next_info; + new_server_info = server_info->next_server; free (server_info); server_info = new_server_info; } @@ -818,12 +818,12 @@ weechat_plugin_get_channel_info (t_weechat_plugin *plugin, char *server) new_channel_info->key = (ptr_channel->key) ? strdup (ptr_channel->key) : strdup (""); new_channel_info->nicks_count = ptr_channel->nicks_count; - new_channel_info->prev_info = last_channel_info; - new_channel_info->next_info = NULL; + new_channel_info->prev_channel = last_channel_info; + new_channel_info->next_channel = NULL; if (!channel_info) channel_info = new_channel_info; else - last_channel_info->next_info = new_channel_info; + last_channel_info->next_channel = new_channel_info; last_channel_info = new_channel_info; } } @@ -856,7 +856,7 @@ weechat_plugin_free_channel_info (t_weechat_plugin *plugin, t_plugin_channel_inf free (channel_info->modes); if (channel_info->key) free (channel_info->key); - new_channel_info = channel_info->next_info; + new_channel_info = channel_info->next_channel; free (channel_info); channel_info = new_channel_info; } diff --git a/src/plugins/scripts/perl/weechat-perl.c b/src/plugins/scripts/perl/weechat-perl.c index e30eb6491..6dec3fe82 100644 --- a/src/plugins/scripts/perl/weechat-perl.c +++ b/src/plugins/scripts/perl/weechat-perl.c @@ -825,22 +825,25 @@ static XS (XS_weechat_get_server_info) } server_info = perl_plugin->get_server_info (perl_plugin); - if (!server_info) { + if (!server_info) + { XSRETURN_EMPTY; - } - + } HV *server_hash = (HV *) sv_2mortal((SV *) newHV()); if (!server_hash) + { + perl_plugin->free_server_info (perl_plugin, server_info); XSRETURN_EMPTY; + } - for (ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_info) + for (ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_server) { strftime(timebuffer, sizeof(timebuffer), "%F %T", localtime(&ptr_server->away_time)); HV *server_hash_member = (HV *) sv_2mortal((SV *) newHV()); - + hv_store (server_hash_member, "autoconnect", 11, newSViv (ptr_server->autoconnect), 0); hv_store (server_hash_member, "autoreconnect", 13, newSViv (ptr_server->autoreconnect), 0); hv_store (server_hash_member, "autoreconnect_delay", 19, newSViv (ptr_server->autoreconnect_delay), 0); @@ -913,15 +916,19 @@ static XS (XS_weechat_get_channel_info) XSRETURN_EMPTY; channel_info = perl_plugin->get_channel_info (perl_plugin, server); - if (!channel_info) { + if (!channel_info) + { XSRETURN_EMPTY; } HV *channel_hash = (HV *) sv_2mortal((SV *) newHV()); if (!channel_hash) + { + perl_plugin->free_channel_info (perl_plugin, channel_info); XSRETURN_EMPTY; + } - for (ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_info) + for (ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_channel) { HV *channel_hash_member = (HV *) sv_2mortal((SV *) newHV()); @@ -977,13 +984,17 @@ static XS (XS_weechat_get_nick_info) XSRETURN_EMPTY; nick_info = perl_plugin->get_nick_info (perl_plugin, server, channel); - if (!nick_info) { + if (!nick_info) + { XSRETURN_EMPTY; } HV *nick_hash = (HV *) sv_2mortal((SV *) newHV()); if (!nick_hash) + { + perl_plugin->free_nick_info (perl_plugin, nick_info); XSRETURN_EMPTY; + } for (ptr_nick = nick_info; ptr_nick; ptr_nick = ptr_nick->next_nick) { diff --git a/src/plugins/scripts/python/weechat-python.c b/src/plugins/scripts/python/weechat-python.c index 7ebc55a48..c516ae963 100644 --- a/src/plugins/scripts/python/weechat-python.c +++ b/src/plugins/scripts/python/weechat-python.c @@ -769,7 +769,7 @@ weechat_python_get_server_info (PyObject *self, PyObject *args) if (!server_info) return server_hash; - for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_info) + for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_server) { strftime(timebuffer, sizeof(timebuffer), "%F %T", localtime(&ptr_server->away_time)); @@ -881,7 +881,7 @@ weechat_python_get_channel_info (PyObject *self, PyObject *args) if (!channel_info) return channel_hash; - for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_info) + for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_channel) { channel_hash_member = PyDict_New(); diff --git a/src/plugins/scripts/ruby/weechat-ruby.c b/src/plugins/scripts/ruby/weechat-ruby.c index 60b22141a..275730b8f 100644 --- a/src/plugins/scripts/ruby/weechat-ruby.c +++ b/src/plugins/scripts/ruby/weechat-ruby.c @@ -956,7 +956,7 @@ weechat_ruby_get_server_info (VALUE class) if (!server_info) return server_hash; - for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_info) + for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_server) { strftime(timebuffer, sizeof(timebuffer), "%F %T", localtime(&ptr_server->away_time)); @@ -1074,7 +1074,7 @@ weechat_ruby_get_channel_info (VALUE class, VALUE server) if (!channel_info) return channel_hash; - for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_info) + for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_channel) { channel_hash_member = rb_hash_new (); diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h index ce57c7efb..cc39abcc3 100644 --- a/src/plugins/weechat-plugin.h +++ b/src/plugins/weechat-plugin.h @@ -93,8 +93,8 @@ struct t_plugin_server_info int is_away; /* 1 is user is marker as away */ time_t away_time; /* time() when user marking as away */ int lag; /* lag (in milliseconds) */ - t_plugin_server_info *prev_info; /* link to previous server info */ - t_plugin_server_info *next_info; /* link to next server info */ + t_plugin_server_info *prev_server; /* link to previous server info */ + t_plugin_server_info *next_server; /* link to next server info */ }; typedef struct t_plugin_channel_info t_plugin_channel_info; @@ -108,8 +108,8 @@ struct t_plugin_channel_info int limit; /* user limit (0 is limit not set) */ char *key; /* channel key (NULL if no key is set) */ int nicks_count; /* # nicks on channel (0 if dcc/pv) */ - t_plugin_channel_info *prev_info; /* link to previous channel infp */ - t_plugin_channel_info *next_info; /* link to next channel info */ + t_plugin_channel_info *prev_channel; /* link to previous channel info */ + t_plugin_channel_info *next_channel; /* link to next channel info */ }; typedef struct t_plugin_nick_info t_plugin_nick_info; diff --git a/weechat/po/cs.po b/weechat/po/cs.po index 938e3361a..9c347249f 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+0100\n" "PO-Revision-Date: 2006-01-24 19:25+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2191,32 +2191,32 @@ msgstr "" "%s funkce \"weechat_plugin_init\" nebyla v pluginu \"%s\" nalezena, načtení " "selhalo\n" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "Inicializuji plugin \"%s\" %s\n" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "%s nemohu načíst plugin \"%s\"\n" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "%s nemohu načíst plugin \"%s\" (nedostatek paměti)\n" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "Plugin \"%s\" (%s) načten.\n" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" odebrán.\n" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" nenalezen\n" @@ -2272,80 +2272,80 @@ msgstr "Změnil se den na %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "bajtů" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "Kb" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "Mb" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "Gb" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "<serverů>" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "-VÍCE-" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "server" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "Nedostatek paměti pro infobar zprávu\n" diff --git a/weechat/po/es.po b/weechat/po/es.po index a142f05cc..6af2b43de 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+0100\n" "PO-Revision-Date: 2006-01-24 19:24+0100\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2211,33 +2211,33 @@ msgstr "" "%s funcin \"weechat_plugin_init\" no encontrada en el plugin \"%s\", fall " "al cargar\n" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "Inicializando plugin \"%s\" %s\n" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "%s no ha sido posible inicializar el plugin \"%s\"\n" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "" "%s no ha sido posible cargar el plugin \"%s\" (no hay suficiente memoria)\n" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "Plugin \"%s\" (%s) cargado.\n" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" descargado.\n" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" no encontrado\n" @@ -2293,80 +2293,80 @@ msgstr "Da cambiado a %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "bytes" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "KB" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "MB" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "GB" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "Tiempo estimado de llegada" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "<servidores>" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "-MS-" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "servidor" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de informacin\n" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 5e66daf3d..62642324d 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+0100\n" "PO-Revision-Date: 2006-01-30 21:05+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2208,32 +2208,32 @@ msgstr "" "%s la fonction \"weechat_plugin_init\" est introuvable dans l'extension \"%s" "\", chec de chargement\n" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "Initialisation de l'extension \"%s\" %s\n" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "%s impossible d'initialiser l'extension \"%s\"\n" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "%s impossible de charger l'extension \"%s\" (mmoire insuffisante)\n" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "Extension \"%s\" (%s) charge.\n" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "Extension \"%s\" dcharge.\n" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s extension \"%s\" non trouve\n" @@ -2291,80 +2291,80 @@ msgstr "Jour chang: %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s le lag est lev, dconnexion du serveur...\n" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "octets" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "Ko" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "Mo" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "Go" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "<serveurs>" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "-PLUS-" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "Pas assez de mmoire pour un message de la barre d'infos\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index b9334639e..1797e7a11 100644 --- a/weechat/po/weechat.pot +++ b/weechat/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: 2006-01-30 21:04+0100\n" +"POT-Creation-Date: 2006-02-03 01:36+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" @@ -2053,32 +2053,32 @@ msgid "" "load\n" msgstr "" -#: src/plugins/plugins.c:652 +#: src/plugins/plugins.c:658 #, c-format msgid "Initializing plugin \"%s\" %s\n" msgstr "" -#: src/plugins/plugins.c:660 +#: src/plugins/plugins.c:666 #, c-format msgid "%s unable to initialize plugin \"%s\"\n" msgstr "" -#: src/plugins/plugins.c:671 +#: src/plugins/plugins.c:677 #, c-format msgid "%s unable to load plugin \"%s\" (not enough memory)\n" msgstr "" -#: src/plugins/plugins.c:679 +#: src/plugins/plugins.c:685 #, c-format msgid "Plugin \"%s\" (%s) loaded.\n" msgstr "" -#: src/plugins/plugins.c:846 +#: src/plugins/plugins.c:852 #, c-format msgid "Plugin \"%s\" unloaded.\n" msgstr "" -#: src/plugins/plugins.c:852 +#: src/plugins/plugins.c:858 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "" @@ -2129,80 +2129,80 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "bytes" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Kb" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Mb" msgstr "" -#: src/gui/curses/gui-display.c:1482 +#: src/gui/curses/gui-display.c:1485 msgid "Gb" msgstr "" -#: src/gui/curses/gui-display.c:1600 +#: src/gui/curses/gui-display.c:1603 msgid "ETA" msgstr "" -#: src/gui/curses/gui-display.c:1947 +#: src/gui/curses/gui-display.c:1965 msgid "<servers>" msgstr "" -#: src/gui/curses/gui-display.c:1959 +#: src/gui/curses/gui-display.c:1977 msgid "(away)" msgstr "" -#: src/gui/curses/gui-display.c:2093 +#: src/gui/curses/gui-display.c:2111 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:2103 +#: src/gui/curses/gui-display.c:2121 msgid "Act: " msgstr "" -#: src/gui/curses/gui-display.c:2194 +#: src/gui/curses/gui-display.c:2212 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-display.c:2210 +#: src/gui/curses/gui-display.c:2228 msgid "-MORE-" msgstr "" -#: src/gui/curses/gui-display.c:2383 +#: src/gui/curses/gui-display.c:2401 msgid " [A] Accept" msgstr "" -#: src/gui/curses/gui-display.c:2384 src/gui/curses/gui-display.c:2388 +#: src/gui/curses/gui-display.c:2402 src/gui/curses/gui-display.c:2406 msgid " [C] Cancel" msgstr "" -#: src/gui/curses/gui-display.c:2393 +#: src/gui/curses/gui-display.c:2411 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-display.c:2397 +#: src/gui/curses/gui-display.c:2415 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-display.c:2398 +#: src/gui/curses/gui-display.c:2416 msgid " [Q] Close DCC view" msgstr "" -#: src/gui/gtk/gui-display.c:657 +#: src/gui/gtk/gui-display.c:2226 msgid "server" msgstr "" -#: src/gui/gui-common.c:731 +#: src/gui/gui-common.c:752 msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:1060 +#: src/gui/gui-common.c:1084 msgid "Not enough memory for infobar message\n" msgstr "" diff --git a/weechat/src/plugins/plugins-interface.c b/weechat/src/plugins/plugins-interface.c index 6d131e844..cb7a0cfdf 100644 --- a/weechat/src/plugins/plugins-interface.c +++ b/weechat/src/plugins/plugins-interface.c @@ -715,14 +715,14 @@ weechat_plugin_get_server_info (t_weechat_plugin *plugin) new_server_info->away_time = ptr_server->away_time; new_server_info->lag = ptr_server->lag; - new_server_info->prev_info = last_server_info; - new_server_info->next_info = NULL; + new_server_info->prev_server = last_server_info; + new_server_info->next_server = NULL; if (!server_info) server_info = new_server_info; else - last_server_info->next_info = new_server_info; + last_server_info->next_server = new_server_info; last_server_info = new_server_info; - } + } } return server_info; @@ -775,7 +775,7 @@ weechat_plugin_free_server_info (t_weechat_plugin *plugin, t_plugin_server_info free (server_info->charset_encode); if (server_info->nick) free (server_info->nick); - new_server_info = server_info->next_info; + new_server_info = server_info->next_server; free (server_info); server_info = new_server_info; } @@ -818,12 +818,12 @@ weechat_plugin_get_channel_info (t_weechat_plugin *plugin, char *server) new_channel_info->key = (ptr_channel->key) ? strdup (ptr_channel->key) : strdup (""); new_channel_info->nicks_count = ptr_channel->nicks_count; - new_channel_info->prev_info = last_channel_info; - new_channel_info->next_info = NULL; + new_channel_info->prev_channel = last_channel_info; + new_channel_info->next_channel = NULL; if (!channel_info) channel_info = new_channel_info; else - last_channel_info->next_info = new_channel_info; + last_channel_info->next_channel = new_channel_info; last_channel_info = new_channel_info; } } @@ -856,7 +856,7 @@ weechat_plugin_free_channel_info (t_weechat_plugin *plugin, t_plugin_channel_inf free (channel_info->modes); if (channel_info->key) free (channel_info->key); - new_channel_info = channel_info->next_info; + new_channel_info = channel_info->next_channel; free (channel_info); channel_info = new_channel_info; } diff --git a/weechat/src/plugins/scripts/perl/weechat-perl.c b/weechat/src/plugins/scripts/perl/weechat-perl.c index e30eb6491..6dec3fe82 100644 --- a/weechat/src/plugins/scripts/perl/weechat-perl.c +++ b/weechat/src/plugins/scripts/perl/weechat-perl.c @@ -825,22 +825,25 @@ static XS (XS_weechat_get_server_info) } server_info = perl_plugin->get_server_info (perl_plugin); - if (!server_info) { + if (!server_info) + { XSRETURN_EMPTY; - } - + } HV *server_hash = (HV *) sv_2mortal((SV *) newHV()); if (!server_hash) + { + perl_plugin->free_server_info (perl_plugin, server_info); XSRETURN_EMPTY; + } - for (ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_info) + for (ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_server) { strftime(timebuffer, sizeof(timebuffer), "%F %T", localtime(&ptr_server->away_time)); HV *server_hash_member = (HV *) sv_2mortal((SV *) newHV()); - + hv_store (server_hash_member, "autoconnect", 11, newSViv (ptr_server->autoconnect), 0); hv_store (server_hash_member, "autoreconnect", 13, newSViv (ptr_server->autoreconnect), 0); hv_store (server_hash_member, "autoreconnect_delay", 19, newSViv (ptr_server->autoreconnect_delay), 0); @@ -913,15 +916,19 @@ static XS (XS_weechat_get_channel_info) XSRETURN_EMPTY; channel_info = perl_plugin->get_channel_info (perl_plugin, server); - if (!channel_info) { + if (!channel_info) + { XSRETURN_EMPTY; } HV *channel_hash = (HV *) sv_2mortal((SV *) newHV()); if (!channel_hash) + { + perl_plugin->free_channel_info (perl_plugin, channel_info); XSRETURN_EMPTY; + } - for (ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_info) + for (ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_channel) { HV *channel_hash_member = (HV *) sv_2mortal((SV *) newHV()); @@ -977,13 +984,17 @@ static XS (XS_weechat_get_nick_info) XSRETURN_EMPTY; nick_info = perl_plugin->get_nick_info (perl_plugin, server, channel); - if (!nick_info) { + if (!nick_info) + { XSRETURN_EMPTY; } HV *nick_hash = (HV *) sv_2mortal((SV *) newHV()); if (!nick_hash) + { + perl_plugin->free_nick_info (perl_plugin, nick_info); XSRETURN_EMPTY; + } for (ptr_nick = nick_info; ptr_nick; ptr_nick = ptr_nick->next_nick) { diff --git a/weechat/src/plugins/scripts/python/weechat-python.c b/weechat/src/plugins/scripts/python/weechat-python.c index 7ebc55a48..c516ae963 100644 --- a/weechat/src/plugins/scripts/python/weechat-python.c +++ b/weechat/src/plugins/scripts/python/weechat-python.c @@ -769,7 +769,7 @@ weechat_python_get_server_info (PyObject *self, PyObject *args) if (!server_info) return server_hash; - for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_info) + for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_server) { strftime(timebuffer, sizeof(timebuffer), "%F %T", localtime(&ptr_server->away_time)); @@ -881,7 +881,7 @@ weechat_python_get_channel_info (PyObject *self, PyObject *args) if (!channel_info) return channel_hash; - for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_info) + for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_channel) { channel_hash_member = PyDict_New(); diff --git a/weechat/src/plugins/scripts/ruby/weechat-ruby.c b/weechat/src/plugins/scripts/ruby/weechat-ruby.c index 60b22141a..275730b8f 100644 --- a/weechat/src/plugins/scripts/ruby/weechat-ruby.c +++ b/weechat/src/plugins/scripts/ruby/weechat-ruby.c @@ -956,7 +956,7 @@ weechat_ruby_get_server_info (VALUE class) if (!server_info) return server_hash; - for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_info) + for(ptr_server = server_info; ptr_server; ptr_server = ptr_server->next_server) { strftime(timebuffer, sizeof(timebuffer), "%F %T", localtime(&ptr_server->away_time)); @@ -1074,7 +1074,7 @@ weechat_ruby_get_channel_info (VALUE class, VALUE server) if (!channel_info) return channel_hash; - for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_info) + for(ptr_channel = channel_info; ptr_channel; ptr_channel = ptr_channel->next_channel) { channel_hash_member = rb_hash_new (); diff --git a/weechat/src/plugins/weechat-plugin.h b/weechat/src/plugins/weechat-plugin.h index ce57c7efb..cc39abcc3 100644 --- a/weechat/src/plugins/weechat-plugin.h +++ b/weechat/src/plugins/weechat-plugin.h @@ -93,8 +93,8 @@ struct t_plugin_server_info int is_away; /* 1 is user is marker as away */ time_t away_time; /* time() when user marking as away */ int lag; /* lag (in milliseconds) */ - t_plugin_server_info *prev_info; /* link to previous server info */ - t_plugin_server_info *next_info; /* link to next server info */ + t_plugin_server_info *prev_server; /* link to previous server info */ + t_plugin_server_info *next_server; /* link to next server info */ }; typedef struct t_plugin_channel_info t_plugin_channel_info; @@ -108,8 +108,8 @@ struct t_plugin_channel_info int limit; /* user limit (0 is limit not set) */ char *key; /* channel key (NULL if no key is set) */ int nicks_count; /* # nicks on channel (0 if dcc/pv) */ - t_plugin_channel_info *prev_info; /* link to previous channel infp */ - t_plugin_channel_info *next_info; /* link to next channel info */ + t_plugin_channel_info *prev_channel; /* link to previous channel info */ + t_plugin_channel_info *next_channel; /* link to next channel info */ }; typedef struct t_plugin_nick_info t_plugin_nick_info; |