From 974eadafdbb997c4288d73c4d24de467c6727dc0 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 14 Nov 2023 16:31:18 +0000 Subject: [PATCH] dir: Expose flatpak_get_user_locales, flatpak_get_system_locales for testing Signed-off-by: Simon McVittie --- common/flatpak-dir-private.h | 3 +++ common/flatpak-dir.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h index 2f7cf897..46811288 100644 --- a/common/flatpak-dir-private.h +++ b/common/flatpak-dir-private.h @@ -1053,4 +1053,7 @@ char ** flatpak_dir_list_unused_refs (Fla GCancellable *cancellable, GError **error); +const GPtrArray *flatpak_get_system_locales (void); +const GPtrArray *flatpak_get_user_locales (void); + #endif /* __FLATPAK_DIR_H__ */ diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 08c14882..b4521e73 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -16363,8 +16363,8 @@ flatpak_dir_get_config_strv (FlatpakDir *self, char *key) return NULL; } -static const GPtrArray * -get_system_locales (FlatpakDir *self) +const GPtrArray * +flatpak_get_system_locales (void) { static GPtrArray *cached = NULL; @@ -16399,8 +16399,8 @@ get_system_locales (FlatpakDir *self) return (const GPtrArray *)cached; } -static const GPtrArray * -get_user_locales (FlatpakDir *self) +const GPtrArray * +flatpak_get_user_locales (void) { static GPtrArray *cached = NULL; @@ -16435,14 +16435,14 @@ flatpak_dir_get_default_locales (FlatpakDir *self) g_auto(GStrv) locale_langs = flatpak_get_current_locale_langs (); g_auto(GStrv) merged = NULL; - langs = get_user_locales (self); + langs = flatpak_get_user_locales (); merged = flatpak_strv_merge (extra_languages, (char **) langs->pdata); return sort_strv (flatpak_strv_merge (merged, locale_langs)); } /* Then get the system default locales */ - langs = get_system_locales (self); + langs = flatpak_get_system_locales (); return sort_strv (flatpak_strv_merge (extra_languages, (char **) langs->pdata)); } @@ -16468,14 +16468,14 @@ flatpak_dir_get_default_locale_languages (FlatpakDir *self) g_auto(GStrv) locale_langs = flatpak_get_current_locale_langs (); g_auto(GStrv) merged = NULL; - langs = get_user_locales (self); + langs = flatpak_get_user_locales (); merged = flatpak_strv_merge (extra_languages, (char **) langs->pdata); return sort_strv (flatpak_strv_merge (merged, locale_langs)); } /* Then get the system default locales */ - langs = get_system_locales (self); + langs = flatpak_get_system_locales (); return sort_strv (flatpak_strv_merge (extra_languages, (char **) langs->pdata)); }