pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 12:56:37 +02:00
Code Activity

Fix display of IRC channel and private name in bar item

Browse Source
This commit is contained in:
Sebastien Helleu
2008-10-24 14:38:11 +02:00
parent f8f7c04633
commit d19162626b
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-bar-item.c
+23 -27
View File
@@ -78,8 +78,8 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
struct t_gui_window *window,
int max_width, int max_height)
{
char buf[256], buf_name[256], away[128], *name;
int number;
char buf[512], buf_name[256], modes[128], away[128], *name;
int number, part_from_channel;
struct t_gui_buffer *buffer;
struct t_irc_server *server;
struct t_irc_channel *channel;
@@ -94,10 +94,11 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
window = weechat_current_window;
buf_name[0] = '\0';
modes[0] = '\0';
away[0] = '\0';
buffer = weechat_window_get_pointer (window, "buffer");
if (buffer)
{
number = weechat_buffer_get_integer (buffer, "number");
@@ -130,37 +131,31 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
{
if (channel)
{
if (channel->nicks
part_from_channel = ((channel->type == IRC_CHANNEL_TYPE_CHANNEL)
&& !channel->nicks);
snprintf (buf_name, sizeof (buf_name),
"%s%s%s%s%s/%s%s%s%s",
(part_from_channel) ? IRC_COLOR_BAR_DELIM : "",
(part_from_channel) ? "(" : "",
IRC_COLOR_STATUS_NAME,
server->name,
IRC_COLOR_BAR_DELIM,
IRC_COLOR_STATUS_NAME,
channel->name,
(part_from_channel) ? IRC_COLOR_BAR_DELIM : "",
(part_from_channel) ? ")" : "");
if (!part_from_channel
&& weechat_config_boolean (irc_config_look_display_channel_modes)
&& channel->modes && channel->modes[0]
&& (strcmp (channel->modes, "+") != 0))
{
snprintf (buf_name, sizeof (buf_name),
"%s%s%s/%s%s%s(%s%s%s)",
IRC_COLOR_STATUS_NAME,
server->name,
snprintf (modes, sizeof (modes),
"%s(%s%s%s)",
IRC_COLOR_BAR_DELIM,
IRC_COLOR_STATUS_NAME,
channel->name,
IRC_COLOR_BAR_DELIM,
IRC_COLOR_STATUS_NAME,
(channel->modes) ? channel->modes : "",
channel->modes,
IRC_COLOR_BAR_DELIM);
}
else
{
snprintf (buf_name, sizeof (buf_name),
"%s%s%s%s%s/%s%s%s%s",
(channel->nicks) ? "" : IRC_COLOR_BAR_DELIM,
(channel->nicks) ? "" : "(",
IRC_COLOR_STATUS_NAME,
server->name,
IRC_COLOR_BAR_DELIM,
IRC_COLOR_STATUS_NAME,
channel->name,
(channel->nicks) ? "" : IRC_COLOR_BAR_DELIM,
(channel->nicks) ? "" : ")");
}
}
}
if (server && server->is_away)
@@ -179,12 +174,13 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
snprintf (buf_name, sizeof (buf_name), "%s", name);
}
snprintf (buf, sizeof (buf), "%s%d%s:%s%s%s",
snprintf (buf, sizeof (buf), "%s%d%s:%s%s%s%s",
IRC_COLOR_STATUS_NUMBER,
number,
IRC_COLOR_BAR_DELIM,
IRC_COLOR_STATUS_NAME,
buf_name,
modes,
away);
return strdup (buf);
}