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

Do not ignore keys inside inherited groups

Browse Source 
When inheriting a group in a filetypes file, do not ignore local keys.
This allows for partial overrides of the parent group, like:

	[settings=Parent]
	key=value

All keys from Parent's group "settings" would be imported, but now the
"key" key wouldn't be ignored anymore and would override a "key" key
from the group copied from Parent if it exists.
This commit is contained in:
Colomban Wendling 2013-10-15 16:01:02 +02:00
parent 48fe855b50
commit b645eccf6e
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/filetypes.c
View File

@ -1279,17 +1279,18 @@ static void load_settings(guint ft_id, GKeyFile *config, GKeyFile *configh)
} }
static void add_keys(GKeyFile *dest, const gchar *group, GKeyFile *src) static void copy_keys(GKeyFile *dest, const gchar *dest_group,
GKeyFile *src, const gchar *src_group)
{ {
gchar **keys = g_key_file_get_keys(src, group, NULL, NULL); gchar **keys = g_key_file_get_keys(src, src_group, NULL, NULL);
gchar **ptr; gchar **ptr;
foreach_strv(ptr, keys) foreach_strv(ptr, keys)
{ {
gchar *key = *ptr; gchar *key = *ptr;
gchar *value = g_key_file_get_value(src, group, key, NULL); gchar *value = g_key_file_get_value(src, src_group, key, NULL);
g_key_file_set_value(dest, group, key, value); g_key_file_set_value(dest, dest_group, key, value);
g_free(value); g_free(value);
} }
g_strfreev(keys); g_strfreev(keys);
@ -1329,7 +1330,7 @@ static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft)
if (g_key_file_load_from_file(src, files[i], G_KEY_FILE_NONE, NULL)) if (g_key_file_load_from_file(src, files[i], G_KEY_FILE_NONE, NULL))
{ {
add_keys(kf, group, src); copy_keys(kf, group, src, group);
loaded = TRUE; loaded = TRUE;
} }
g_key_file_free(src); g_key_file_free(src);
@ -1351,21 +1352,27 @@ static void copy_ft_groups(GKeyFile *kf)
foreach_strv(ptr, groups) foreach_strv(ptr, groups)
{ {
gchar *group = *ptr; gchar *group = *ptr;
gchar *name = strstr(*ptr, "="); gchar *old_group;
gchar *name = strchr(*ptr, '=');
GeanyFiletype *ft; GeanyFiletype *ft;
if (!name) if (!name || !name[1]) /* no name or no parent name */
continue; continue;
old_group = g_strdup(group);
/* terminate group at '=' */ /* terminate group at '=' */
*name = 0; *name = 0;
name++; name++;
if (!name[0])
continue;
ft = filetypes_lookup_by_name(name); ft = filetypes_lookup_by_name(name);
if (ft) if (ft)
{
add_group_keys(kf, group, ft); add_group_keys(kf, group, ft);
/* move old group keys (foo=bar) to proper group name (foo) */
copy_keys(kf, group, kf, old_group);
}
g_free(old_group);
} }
g_strfreev(groups); g_strfreev(groups);
} }