Merge pull request #94 from smcv/no-system-fonts

flatpak-run: don't fail if there are no system fonts
This commit is contained in:
Alexander Larsson
2016-06-07 09:36:22 +02:00

View File

@@ -2278,9 +2278,12 @@ add_font_path_args (GPtrArray *argv_array)
g_autoptr(GFile) user_font1 = NULL;
g_autoptr(GFile) user_font2 = NULL;
add_args (argv_array,
"--bind", SYSTEM_FONTS_DIR, "/run/host/fonts",
NULL);
if (g_file_test (SYSTEM_FONTS_DIR, G_FILE_TEST_EXISTS))
{
add_args (argv_array,
"--bind", SYSTEM_FONTS_DIR, "/run/host/fonts",
NULL);
}
home = g_file_new_for_path (g_get_home_dir ());
user_font1 = g_file_resolve_relative_path (home, ".local/share/fonts");