summaryrefslogtreecommitdiff
path: root/src/plugins/irc/irc-bar-item.c
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2009-06-10 12:40:05 +0200
committerSebastien Helleu <flashcode@flashtux.org>2009-06-10 12:40:05 +0200
commit8d58b81d83d9a5462f1b4aeb274a16a91ef213d1 (patch)
tree4bf0ef51ea845f54fa97012b1ebe9a85e24f1750 /src/plugins/irc/irc-bar-item.c
parentfd31dbb97ec00ee49cec21c4731677c403c80564 (diff)
downloadweechat-8d58b81d83d9a5462f1b4aeb274a16a91ef213d1.zip
Add buffer merging feature, with /buffer merge/unmerge (task #7404)
Diffstat (limited to 'src/plugins/irc/irc-bar-item.c')
-rw-r--r--src/plugins/irc/irc-bar-item.c24
1 files changed, 6 insertions, 18 deletions
diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c
index 29d026251..2292a6edd 100644
--- a/src/plugins/irc/irc-bar-item.c
+++ b/src/plugins/irc/irc-bar-item.c
@@ -143,24 +143,12 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
{
if (server && !channel)
{
- if (weechat_config_boolean (irc_config_look_one_server_buffer))
- {
- snprintf (buf_name, sizeof (buf_name), "%s%s[<%s%s%s>]",
- _("servers"),
- IRC_COLOR_BAR_DELIM,
- IRC_COLOR_STATUS_NAME,
- (irc_current_server) ? irc_current_server->name : "-",
- IRC_COLOR_BAR_DELIM);
- }
- else
- {
- snprintf (buf_name, sizeof (buf_name), "%s%s[%s%s%s]",
- _("server"),
- IRC_COLOR_BAR_DELIM,
- IRC_COLOR_STATUS_NAME,
- server->name,
- IRC_COLOR_BAR_DELIM);
- }
+ snprintf (buf_name, sizeof (buf_name), "%s%s[%s%s%s]",
+ _("server"),
+ IRC_COLOR_BAR_DELIM,
+ IRC_COLOR_STATUS_NAME,
+ server->name,
+ IRC_COLOR_BAR_DELIM);
}
else
{