summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--src/gui/curses/gui-curses-status.c25
-rw-r--r--weechat/ChangeLog3
-rw-r--r--weechat/src/gui/curses/gui-curses-status.c25
4 files changed, 32 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index c86fa8418..47f7ad80f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2007-07-05
+ChangeLog - 2007-07-08
Version 0.2.6 (under dev!):
+ * fixed charset bug with channel names in status bar (bug #20400)
* added "scroll" option to /buffer command
* down key now saves input to history and clears input line (task #7049)
* fixed log file when channel name contains "/" (bug #20072)
diff --git a/src/gui/curses/gui-curses-status.c b/src/gui/curses/gui-curses-status.c
index b3fe033f6..3624c7b27 100644
--- a/src/gui/curses/gui-curses-status.c
+++ b/src/gui/curses/gui-curses-status.c
@@ -165,11 +165,11 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
|| ((CHANNEL(ptr_win->buffer)->type == CHANNEL_TYPE_DCC_CHAT)
&& (CHANNEL(ptr_win->buffer)->dcc_chat)
&& (((t_irc_dcc *)(CHANNEL(ptr_win->buffer)->dcc_chat))->sock < 0)))
- wprintw (GUI_CURSES(ptr_win)->win_status, "(%s)",
- CHANNEL(ptr_win->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "(%s)",
+ CHANNEL(ptr_win->buffer)->name);
else
- wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
- CHANNEL(ptr_win->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+ CHANNEL(ptr_win->buffer)->name);
if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer)
{
/* display channel modes */
@@ -182,8 +182,8 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS);
if (CHANNEL(ptr_win->buffer)->modes
&& (strcmp (CHANNEL(ptr_win->buffer)->modes, "+") != 0))
- wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
- CHANNEL(ptr_win->buffer)->modes);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+ CHANNEL(ptr_win->buffer)->modes);
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
COLOR_WIN_STATUS_DELIMITERS);
wprintw (GUI_CURSES(ptr_win)->win_status, ")");
@@ -295,13 +295,16 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
else
snprintf (format, sizeof (format) - 1, "%%.%ds", cfg_look_hotlist_names_length);
if (BUFFER_IS_SERVER(ptr_hotlist->buffer))
- wprintw (GUI_CURSES(ptr_win)->win_status, format,
- (ptr_hotlist->server) ?
- ptr_hotlist->server->name :
- SERVER(ptr_hotlist->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
+ format,
+ (ptr_hotlist->server) ?
+ ptr_hotlist->server->name :
+ SERVER(ptr_hotlist->buffer)->name);
else if (BUFFER_IS_CHANNEL(ptr_hotlist->buffer)
|| BUFFER_IS_PRIVATE(ptr_hotlist->buffer))
- wprintw (GUI_CURSES(ptr_win)->win_status, format, CHANNEL(ptr_hotlist->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
+ format,
+ CHANNEL(ptr_hotlist->buffer)->name);
}
break;
case BUFFER_TYPE_DCC:
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index c86fa8418..47f7ad80f 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2007-07-05
+ChangeLog - 2007-07-08
Version 0.2.6 (under dev!):
+ * fixed charset bug with channel names in status bar (bug #20400)
* added "scroll" option to /buffer command
* down key now saves input to history and clears input line (task #7049)
* fixed log file when channel name contains "/" (bug #20072)
diff --git a/weechat/src/gui/curses/gui-curses-status.c b/weechat/src/gui/curses/gui-curses-status.c
index b3fe033f6..3624c7b27 100644
--- a/weechat/src/gui/curses/gui-curses-status.c
+++ b/weechat/src/gui/curses/gui-curses-status.c
@@ -165,11 +165,11 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
|| ((CHANNEL(ptr_win->buffer)->type == CHANNEL_TYPE_DCC_CHAT)
&& (CHANNEL(ptr_win->buffer)->dcc_chat)
&& (((t_irc_dcc *)(CHANNEL(ptr_win->buffer)->dcc_chat))->sock < 0)))
- wprintw (GUI_CURSES(ptr_win)->win_status, "(%s)",
- CHANNEL(ptr_win->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "(%s)",
+ CHANNEL(ptr_win->buffer)->name);
else
- wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
- CHANNEL(ptr_win->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+ CHANNEL(ptr_win->buffer)->name);
if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer)
{
/* display channel modes */
@@ -182,8 +182,8 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS);
if (CHANNEL(ptr_win->buffer)->modes
&& (strcmp (CHANNEL(ptr_win->buffer)->modes, "+") != 0))
- wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
- CHANNEL(ptr_win->buffer)->modes);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+ CHANNEL(ptr_win->buffer)->modes);
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
COLOR_WIN_STATUS_DELIMITERS);
wprintw (GUI_CURSES(ptr_win)->win_status, ")");
@@ -295,13 +295,16 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
else
snprintf (format, sizeof (format) - 1, "%%.%ds", cfg_look_hotlist_names_length);
if (BUFFER_IS_SERVER(ptr_hotlist->buffer))
- wprintw (GUI_CURSES(ptr_win)->win_status, format,
- (ptr_hotlist->server) ?
- ptr_hotlist->server->name :
- SERVER(ptr_hotlist->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
+ format,
+ (ptr_hotlist->server) ?
+ ptr_hotlist->server->name :
+ SERVER(ptr_hotlist->buffer)->name);
else if (BUFFER_IS_CHANNEL(ptr_hotlist->buffer)
|| BUFFER_IS_PRIVATE(ptr_hotlist->buffer))
- wprintw (GUI_CURSES(ptr_win)->win_status, format, CHANNEL(ptr_hotlist->buffer)->name);
+ gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
+ format,
+ CHANNEL(ptr_hotlist->buffer)->name);
}
break;
case BUFFER_TYPE_DCC:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 21:29:50 +0000