From 3eaf388bce02005161f404a377be5fbeed485e43 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 15 Nov 2005 11:32:34 +0000 Subject: [PATCH] Fixed startup crash when using terms with no color --- po/cs.po | 32 +++++++-------- po/es.po | 32 +++++++-------- po/fr.po | 32 +++++++-------- po/weechat.pot | 32 +++++++-------- src/gui/curses/gui-display.c | 59 +++++++++++----------------- weechat/po/cs.po | 32 +++++++-------- weechat/po/es.po | 32 +++++++-------- weechat/po/fr.po | 32 +++++++-------- weechat/po/weechat.pot | 32 +++++++-------- weechat/src/gui/curses/gui-display.c | 59 +++++++++++----------------- 10 files changed, 172 insertions(+), 202 deletions(-) diff --git a/po/cs.po b/po/cs.po index 071aa0920..5b507602b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: 2005-11-13 22:38+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2257,64 +2257,64 @@ 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:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "bajtů" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "Kb" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "Mb" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "Gb" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "-VÍCE-" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" diff --git a/po/es.po b/po/es.po index 79641a9a6..a8a196422 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: 2005-11-13 22:38+0100\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -2243,64 +2243,64 @@ msgstr "" 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:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "bytes" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "KB" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "MB" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "GB" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "-MS-" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" diff --git a/po/fr.po b/po/fr.po index 55cb8dcad..87ee6ef69 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: 2005-11-13 23:09+0100\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -2277,64 +2277,64 @@ msgstr "Jour chang 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:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "octets" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "Ko" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "Mo" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "Go" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "-PLUS-" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" diff --git a/po/weechat.pot b/po/weechat.pot index d1a107f28..6a8e1e1ee 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: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2117,64 +2117,64 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "" -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr "" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr "" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr "" diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 77f54a25a..96018efed 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -485,12 +485,9 @@ gui_color_get_pair (int num_color) void gui_window_set_weechat_color (WINDOW *window, int num_color) { - if (has_colors ()) - { - wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE); - wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) | - gui_color[num_color]->attributes); - } + wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE); + wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) | + gui_color[num_color]->attributes); } /* @@ -501,10 +498,7 @@ gui_window_set_weechat_color (WINDOW *window, int num_color) void gui_window_chat_set_style (t_gui_window *window, int style) { - if (has_colors ()) - { - wattron (window->win_chat, style); - } + wattron (window->win_chat, style); } /* @@ -515,10 +509,7 @@ gui_window_chat_set_style (t_gui_window *window, int style) void gui_window_chat_remove_style (t_gui_window *window, int style) { - if (has_colors ()) - { - wattroff (window->win_chat, style); - } + wattroff (window->win_chat, style); } /* @@ -594,19 +585,16 @@ gui_window_chat_reset_color_style (t_gui_window *window) void gui_window_chat_set_color (t_gui_window *window, int fg, int bg) { - if (has_colors ()) + if (((fg == -1) || (fg == 99)) + && ((bg == -1) || (bg == 99))) + wattron (window->win_chat, COLOR_PAIR(63)); + else { - if (((fg == -1) || (fg == 99)) - && ((bg == -1) || (bg == 99))) - wattron (window->win_chat, COLOR_PAIR(63)); - else - { - if ((fg == -1) || (fg == 99)) - fg = WEECHAT_COLOR_WHITE; - if ((bg == -1) || (bg == 99)) - bg = 0; - wattron (window->win_chat, COLOR_PAIR((bg * 8) + fg)); - } + if ((fg == -1) || (fg == 99)) + fg = WEECHAT_COLOR_WHITE; + if ((bg == -1) || (bg == 99)) + bg = 0; + wattron (window->win_chat, COLOR_PAIR((bg * 8) + fg)); } } @@ -617,15 +605,12 @@ gui_window_chat_set_color (t_gui_window *window, int fg, int bg) void gui_window_chat_set_weechat_color (t_gui_window *window, int weechat_color) { - if (has_colors ()) - { - gui_window_chat_reset_style (window); - gui_window_chat_set_style (window, - gui_color[weechat_color]->attributes); - gui_window_chat_set_color (window, - gui_color[weechat_color]->foreground, - gui_color[weechat_color]->background); - } + gui_window_chat_reset_style (window); + gui_window_chat_set_style (window, + gui_color[weechat_color]->attributes); + gui_window_chat_set_color (window, + gui_color[weechat_color]->foreground, + gui_color[weechat_color]->background); } /* @@ -3220,9 +3205,9 @@ gui_init_colors () { start_color (); use_default_colors (); - gui_init_color_pairs (); - gui_init_weechat_colors (); } + gui_init_color_pairs (); + gui_init_weechat_colors (); } /* diff --git a/weechat/po/cs.po b/weechat/po/cs.po index 071aa0920..5b507602b 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: 2005-11-13 22:38+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2257,64 +2257,64 @@ 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:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "bajtů" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "Kb" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "Mb" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "Gb" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "-VÍCE-" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" diff --git a/weechat/po/es.po b/weechat/po/es.po index 79641a9a6..a8a196422 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: 2005-11-13 22:38+0100\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -2243,64 +2243,64 @@ msgstr "" 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:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "bytes" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "KB" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "MB" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "GB" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "-MS-" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 55cb8dcad..87ee6ef69 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: 2005-11-13 23:09+0100\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -2277,64 +2277,64 @@ msgstr "Jour chang 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:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "octets" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "Ko" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "Mo" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "Go" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "-PLUS-" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index d1a107f28..6a8e1e1ee 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: 2005-11-13 23:09+0100\n" +"POT-Creation-Date: 2005-11-15 12:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2117,64 +2117,64 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "bytes" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Kb" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Mb" msgstr "" -#: src/gui/curses/gui-display.c:1474 +#: src/gui/curses/gui-display.c:1459 msgid "Gb" msgstr "" -#: src/gui/curses/gui-display.c:1927 +#: src/gui/curses/gui-display.c:1912 msgid "" msgstr "" -#: src/gui/curses/gui-display.c:1939 +#: src/gui/curses/gui-display.c:1924 msgid "(away)" msgstr "" -#: src/gui/curses/gui-display.c:2073 +#: src/gui/curses/gui-display.c:2058 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:2083 +#: src/gui/curses/gui-display.c:2068 msgid "Act: " msgstr "" -#: src/gui/curses/gui-display.c:2171 +#: src/gui/curses/gui-display.c:2156 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-display.c:2187 +#: src/gui/curses/gui-display.c:2172 msgid "-MORE-" msgstr "" -#: src/gui/curses/gui-display.c:2365 +#: src/gui/curses/gui-display.c:2350 msgid " [A] Accept" msgstr "" -#: src/gui/curses/gui-display.c:2366 src/gui/curses/gui-display.c:2370 +#: src/gui/curses/gui-display.c:2351 src/gui/curses/gui-display.c:2355 msgid " [C] Cancel" msgstr "" -#: src/gui/curses/gui-display.c:2375 +#: src/gui/curses/gui-display.c:2360 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-display.c:2379 +#: src/gui/curses/gui-display.c:2364 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-display.c:2380 +#: src/gui/curses/gui-display.c:2365 msgid " [Q] Close DCC view" msgstr "" diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 77f54a25a..96018efed 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -485,12 +485,9 @@ gui_color_get_pair (int num_color) void gui_window_set_weechat_color (WINDOW *window, int num_color) { - if (has_colors ()) - { - wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE); - wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) | - gui_color[num_color]->attributes); - } + wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE); + wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) | + gui_color[num_color]->attributes); } /* @@ -501,10 +498,7 @@ gui_window_set_weechat_color (WINDOW *window, int num_color) void gui_window_chat_set_style (t_gui_window *window, int style) { - if (has_colors ()) - { - wattron (window->win_chat, style); - } + wattron (window->win_chat, style); } /* @@ -515,10 +509,7 @@ gui_window_chat_set_style (t_gui_window *window, int style) void gui_window_chat_remove_style (t_gui_window *window, int style) { - if (has_colors ()) - { - wattroff (window->win_chat, style); - } + wattroff (window->win_chat, style); } /* @@ -594,19 +585,16 @@ gui_window_chat_reset_color_style (t_gui_window *window) void gui_window_chat_set_color (t_gui_window *window, int fg, int bg) { - if (has_colors ()) + if (((fg == -1) || (fg == 99)) + && ((bg == -1) || (bg == 99))) + wattron (window->win_chat, COLOR_PAIR(63)); + else { - if (((fg == -1) || (fg == 99)) - && ((bg == -1) || (bg == 99))) - wattron (window->win_chat, COLOR_PAIR(63)); - else - { - if ((fg == -1) || (fg == 99)) - fg = WEECHAT_COLOR_WHITE; - if ((bg == -1) || (bg == 99)) - bg = 0; - wattron (window->win_chat, COLOR_PAIR((bg * 8) + fg)); - } + if ((fg == -1) || (fg == 99)) + fg = WEECHAT_COLOR_WHITE; + if ((bg == -1) || (bg == 99)) + bg = 0; + wattron (window->win_chat, COLOR_PAIR((bg * 8) + fg)); } } @@ -617,15 +605,12 @@ gui_window_chat_set_color (t_gui_window *window, int fg, int bg) void gui_window_chat_set_weechat_color (t_gui_window *window, int weechat_color) { - if (has_colors ()) - { - gui_window_chat_reset_style (window); - gui_window_chat_set_style (window, - gui_color[weechat_color]->attributes); - gui_window_chat_set_color (window, - gui_color[weechat_color]->foreground, - gui_color[weechat_color]->background); - } + gui_window_chat_reset_style (window); + gui_window_chat_set_style (window, + gui_color[weechat_color]->attributes); + gui_window_chat_set_color (window, + gui_color[weechat_color]->foreground, + gui_color[weechat_color]->background); } /* @@ -3220,9 +3205,9 @@ gui_init_colors () { start_color (); use_default_colors (); - gui_init_color_pairs (); - gui_init_weechat_colors (); } + gui_init_color_pairs (); + gui_init_weechat_colors (); } /*