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

core: compute first internal code and expanded name before removing key (issue #1875)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-01-28 22:49:36 +01:00
parent a9289cbdc1
commit 3005658f38
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-key.c
+20 -7
View File
@@ -884,15 +884,24 @@ int
gui_key_unbind (struct t_gui_buffer *buffer, int context, const char *key)
{
struct t_gui_key *ptr_key;
char *internal_code;
char *internal_code, *expanded_name;
int rc;
rc = 0;
internal_code = gui_key_get_internal_code (key);
if (!internal_code)
return 0;
expanded_name = gui_key_get_expanded_name (internal_code);
if (!expanded_name)
{
free (internal_code);
return 0;
}
ptr_key = gui_key_search ((buffer) ? buffer->keys : gui_keys[context],
(internal_code) ? internal_code : key);
free (internal_code);
internal_code);
if (ptr_key)
{
if (buffer)
@@ -906,18 +915,22 @@ gui_key_unbind (struct t_gui_buffer *buffer, int context, const char *key)
{
gui_chat_printf (NULL,
_("Key \"%s\" unbound (context: \"%s\")"),
key,
expanded_name,
gui_key_context_string[context]);
}
gui_key_free (&gui_keys[context], &last_gui_key[context],
&gui_keys_count[context], ptr_key);
}
(void) hook_signal_send ("key_unbind",
WEECHAT_HOOK_SIGNAL_STRING, (char *)key);
return 1;
WEECHAT_HOOK_SIGNAL_STRING,
(char *)expanded_name);
rc = 1;
}
return 0;
free (internal_code);
free (expanded_name);
return rc;
}
/*