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

When copying filetype groups, add keys from both system and user ones

Browse Source 
This makes sure we use the user filetypes in precedence over system ones
even if both are present.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5736 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling 2011-04-24 15:30:32 +00:00
parent 23a266f189
commit f622c978c2
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/filetypes.c
View File

@ -1248,22 +1248,30 @@ static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user)
static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft)
{
GKeyFile *src = g_key_file_new();
gchar *f;
gchar *files[2];
gboolean loaded = FALSE;
guint i;
f = filetypes_get_filename(ft, FALSE);
if (!g_file_test(f, G_FILE_TEST_EXISTS))
f = filetypes_get_filename(ft, TRUE);
files[0] = filetypes_get_filename(ft, FALSE);
files[1] = filetypes_get_filename(ft, TRUE);
if (!g_key_file_load_from_file(src, f, G_KEY_FILE_NONE, NULL))
for (i = 0; i < G_N_ELEMENTS(files); i++)
{
geany_debug("Could not read config file %s for [%s=%s]!", f, group, ft->name);
g_free(f);
return;
}
g_free(f);
GKeyFile *src = g_key_file_new();
add_keys(kf, group, src);
if (g_key_file_load_from_file(src, files[i], G_KEY_FILE_NONE, NULL))
{
add_keys(kf, group, src);
loaded = TRUE;
}
g_key_file_free(src);
}
if (!loaded)
geany_debug("Could not read config file %s for [%s=%s]!", files[0], group, ft->name);
g_free(files[0]);
g_free(files[1]);
}