From 5395673df8c63aa1b1be930d85b8ee578cc45cc2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 7 Jun 2023 22:56:23 +0300 Subject: [PATCH 30/30] sdl2 theme: Fix "unused entry" warnings about CJK fonts See osdn #45866 Signed-off-by: Marko Lindqvist --- client/gui-sdl2/themespec.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/client/gui-sdl2/themespec.c b/client/gui-sdl2/themespec.c index ee75e2b231..397fb43c60 100644 --- a/client/gui-sdl2/themespec.c +++ b/client/gui-sdl2/themespec.c @@ -760,19 +760,33 @@ struct theme *theme_read_toplevel(const char *theme_name) t->priority = secfile_lookup_int_default(file, 0, "themespec.priority"); langname = setup_langname(); - if (langname) { - if (strstr(langname, "zh_CN") != NULL) { - c = secfile_lookup_str(file, "themespec.font_file_zh_CN"); - } else if (strstr(langname, "ja") != NULL) { - c = secfile_lookup_str(file, "themespec.font_file_ja"); - } else if (strstr(langname, "ko") != NULL) { - c = secfile_lookup_str(file, "themespec.font_file_ko"); - } else { - c = secfile_lookup_str(file, "themespec.font_file"); - } + + c = NULL; + + if (langname != NULL && strstr(langname, "zh_CN") != NULL) { + c = secfile_lookup_str(file, "themespec.font_file_zh_CN"); + } else { + (void) secfile_entry_lookup(file, "themespec.font_file_zh_CN"); + } + + if (c == NULL && langname != NULL && strstr(langname, "ja") != NULL) { + c = secfile_lookup_str(file, "themespec.font_file_ja"); } else { + (void) secfile_entry_lookup(file, "themespec.font_file_ja"); + } + + if (c == NULL && langname != NULL && strstr(langname, "ko") != NULL) { + c = secfile_lookup_str(file, "themespec.font_file_ko"); + } else { + (void) secfile_entry_lookup(file, "themespec.font_file_ko"); + } + + if (c == NULL) { c = secfile_lookup_str(file, "themespec.font_file"); + } else { + (void) secfile_entry_lookup(file, "themespec.font_file"); } + if ((filename = fileinfoname(get_data_dirs(), c))) { t->font_filename = fc_strdup(filename); } else { -- 2.39.2