pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-07 02:03:13 +02:00
Code Activity

core, plugins: force "short_name" in buffers to non-empty value (name by default), remove buffer property "short_name_is_set"

Browse Source
This commit is contained in:
Sébastien Helleu
2024-06-18 18:26:33 +02:00
parent eb83e8d018
commit 1fcf5ac5b3
20 changed files with 92 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-channel.c
+2 -20
View File
@@ -190,7 +190,6 @@ irc_channel_create_buffer (struct t_irc_server *server,
int buffer_created, current_buffer_number, buffer_position;
int autojoin_join, manual_join, noswitch;
char str_number[32], *channel_name_lower, *buffer_name, *prompt;
const char *short_name, *localvar_channel;
buffer_created = 0;
buffer_props = NULL;
@@ -218,6 +217,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
NULL, NULL);
if (buffer_props)
{
weechat_hashtable_set (buffer_props, "short_name", channel_name);
weechat_hashtable_set (
buffer_props,
"input_multiline",
@@ -251,6 +251,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
{
if (!irc_upgrading)
weechat_nicklist_remove_all (ptr_buffer);
weechat_hashtable_remove (buffer_props, "short_name");
weechat_hashtable_map (buffer_props, &irc_channel_apply_props, ptr_buffer);
}
else
@@ -312,25 +313,6 @@ irc_channel_create_buffer (struct t_irc_server *server,
buffer_created = 1;
}
if (buffer_created)
{
if (!weechat_buffer_get_integer (ptr_buffer, "short_name_is_set"))
weechat_buffer_set (ptr_buffer, "short_name", channel_name);
}
else
{
short_name = weechat_buffer_get_string (ptr_buffer, "short_name");
localvar_channel = weechat_buffer_get_string (ptr_buffer,
"localvar_channel");
if (!short_name
|| (localvar_channel
&& (strcmp (localvar_channel, short_name) == 0)))
{
/* update the short_name only if it was not changed by the user */
weechat_buffer_set (ptr_buffer, "short_name", channel_name);
}
}
if (buffer_created)
{
(void) weechat_hook_signal_send ("logger_backlog",
src/plugins/irc/irc-raw.c
+2 -6
View File
@@ -390,6 +390,8 @@ irc_raw_open (int switch_to_buffer)
NULL, NULL);
if (buffer_props)
{
weechat_hashtable_set (buffer_props,
"short_name", IRC_RAW_BUFFER_NAME);
weechat_hashtable_set (buffer_props,
"localvar_set_type", "debug");
weechat_hashtable_set (buffer_props,
@@ -412,12 +414,6 @@ irc_raw_open (int switch_to_buffer)
if (!irc_raw_buffer)
return;
if (!weechat_buffer_get_integer (irc_raw_buffer, "short_name_is_set"))
{
weechat_buffer_set (irc_raw_buffer, "short_name",
IRC_RAW_BUFFER_NAME);
}
irc_raw_set_localvar_filter ();
irc_raw_refresh (0);
src/plugins/irc/irc-server.c
+1 -3
View File
@@ -4804,6 +4804,7 @@ irc_server_create_buffer (struct t_irc_server *server)
NULL, NULL);
if (buffer_props)
{
weechat_hashtable_set (buffer_props, "short_name", server->name);
weechat_hashtable_set (buffer_props, "localvar_set_type", "server");
weechat_hashtable_set (buffer_props,
"localvar_set_server", server->name);
@@ -4833,9 +4834,6 @@ irc_server_create_buffer (struct t_irc_server *server)
if (!server->buffer)
return NULL;
if (!weechat_buffer_get_integer (server->buffer, "short_name_is_set"))
weechat_buffer_set (server->buffer, "short_name", server->name);
(void) weechat_hook_signal_send ("logger_backlog",
WEECHAT_HOOK_SIGNAL_POINTER,
server->buffer);