mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 16:57:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

common/flatpak-run: respect user's XDG base directories (#3626)

Browse Source 
This makes flatpak respects XDG_DATA_HOME and XDG_CACHE_HOME for binding
user's fonts and icons into the sandbox.
This commit is contained in:
alaviss
2020-06-05 09:31:39 -05:00
committed by GitHub
parent 669a5bf671
commit ea1830e108
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/flatpak-run.c
View File

@@ -1730,7 +1730,7 @@ static void
add_font_path_args (FlatpakBwrap *bwrap)
{
g_autoptr(GString) xml_snippet = g_string_new ("");
g_autoptr(GFile) home = NULL;
gchar *path_build_tmp = NULL;
g_autoptr(GFile) user_font1 = NULL;
g_autoptr(GFile) user_font2 = NULL;
g_autoptr(GFile) user_font_cache = NULL;
@@ -1787,9 +1787,13 @@ add_font_path_args (FlatpakBwrap *bwrap)
NULL);
}
home = g_file_new_for_path (g_get_home_dir ());
user_font1 = g_file_resolve_relative_path (home, ".local/share/fonts");
user_font2 = g_file_resolve_relative_path (home, ".fonts");
path_build_tmp = g_build_filename (g_get_user_data_dir (), "fonts", NULL);
user_font1 = g_file_new_for_path (path_build_tmp);
g_clear_pointer (&path_build_tmp, g_free);
path_build_tmp = g_build_filename (g_get_home_dir (), ".fonts", NULL);
user_font2 = g_file_new_for_path (path_build_tmp);
g_clear_pointer (&path_build_tmp, g_free);
if (g_file_query_exists (user_font1, NULL))
{
@@ -1810,7 +1814,10 @@ add_font_path_args (FlatpakBwrap *bwrap)
flatpak_file_get_path_cached (user_font2));
}
user_font_cache = g_file_resolve_relative_path (home, ".cache/fontconfig");
path_build_tmp = g_build_filename (g_get_user_cache_dir (), "fontconfig", NULL);
user_font_cache = g_file_new_for_path (path_build_tmp);
g_clear_pointer (&path_build_tmp, g_free);
if (g_file_query_exists (user_font_cache, NULL))
{
flatpak_bwrap_add_args (bwrap,
@@ -1837,7 +1844,7 @@ add_font_path_args (FlatpakBwrap *bwrap)
static void
add_icon_path_args (FlatpakBwrap *bwrap)
{
g_autoptr(GFile) home = NULL;
g_autofree gchar *user_icons_path = NULL;
g_autoptr(GFile) user_icons = NULL;
if (g_file_test ("/usr/share/icons", G_FILE_TEST_IS_DIR))
@@ -1847,8 +1854,8 @@ add_icon_path_args (FlatpakBwrap *bwrap)
NULL);
}
home = g_file_new_for_path (g_get_home_dir ());
user_icons = g_file_resolve_relative_path (home, ".local/share/icons");
user_icons_path = g_build_filename (g_get_user_data_dir (), "icons", NULL);
user_icons = g_file_new_for_path (user_icons_path);
if (g_file_query_exists (user_icons, NULL))
{
flatpak_bwrap_add_args (bwrap,