diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2012-05-10 20:13:34 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-05-22 22:57:52 -0400 |
| commit | ca6555a55ab8b64e43ca3527e479da3ed1af0b7f (patch) | |
| tree | 9d29b3b230f1419c9c96da32f95263303ce54b28 | |
| parent | 926aa9bca4e9b50dcf563318f8eb40a260c90f1f (diff) | |
| download | pango-ca6555a55ab8b64e43ca3527e479da3ed1af0b7f.tar.gz | |
Read pangox.aliases from XDG_CONFIG_HOME
Change the X fontmap code to look for the aliases file
in $XDG_CONFIG_HOME/pango/pangox.aliases instead of
~/.pangox_aliases
https://bugzilla.gnome.org/show_bug.cgi?id=675400
| -rw-r--r-- | pango/pangox-fontmap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index 30946452..74925dc9 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -906,11 +906,17 @@ static void pango_x_font_map_read_aliases (PangoXFontMap *xfontmap) { char **files; + char *user_file; char *files_str = pango_config_key_get ("PangoX/AliasFiles"); int n; if (!files_str) - files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases"); + { + user_file = g_build_filename (g_get_user_config_dir (), "pango", "pangox.aliases", NULL); + + files_str = g_strconcat (user_file, ":" SYSCONFDIR "/pango/pangox.aliases", NULL); + g_free (user_file); + } files = pango_split_file_list (files_str); |