HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1126 from b4n/plugin-key-group-strings-lifetime

Browse Source 
Don't require plugin key group name and label strings to be static
This commit is contained in:
Colomban Wendling 2016-07-09 00:26:32 +02:00
commit a260a5ac9a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/keybindings.c
View File

@ -262,8 +262,9 @@ static void add_kb_group(GeanyKeyGroup *group,
{ {
g_ptr_array_add(keybinding_groups, group); g_ptr_array_add(keybinding_groups, group);
group->name = name; /* as for items, we only require duplicated name and label for plugins */
group->label = label; group->name = plugin ? g_strdup(name) : name;
group->label = plugin ? g_strdup(label) : label;
group->callback = callback; group->callback = callback;
group->cb_func = NULL; group->cb_func = NULL;
group->cb_data = NULL; group->cb_data = NULL;
@ -722,6 +723,9 @@ static void free_key_group(gpointer item)
if (group->cb_data_destroy) if (group->cb_data_destroy)
group->cb_data_destroy(group->cb_data); group->cb_data_destroy(group->cb_data);
g_free(group->plugin_keys); g_free(group->plugin_keys);
/* we allocated those in add_kb_group() as it's a plugin group */
g_free((gchar *) group->name);
g_free((gchar *) group->label);
g_free(group); g_free(group);
} }
} }