From af9d19d5b9af02db0ebd6f08b726cbd5653f8356 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 21 Oct 2019 17:01:37 -0300 Subject: [PATCH] Fixing detection of the default config based on product_name. --- src/pw3270/common/config.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c index d22632c..93bac08 100644 --- a/src/pw3270/common/config.c +++ b/src/pw3270/common/config.c @@ -222,9 +222,9 @@ // Search the application DATADIR // { - gchar *filename = g_build_filename(DATAROOTDIR,PACKAGE_NAME,name,NULL); + gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL); - trace("Checking for %s",filename); + trace("Checking for default config \"%s\"",filename); if(g_file_test(filename,G_FILE_TEST_IS_REGULAR)) return filename; @@ -255,11 +255,24 @@ const gchar * const * sysdata = g_get_system_data_dirs(); for(f=0;sysdata[f];f++) { - gchar *filename = g_build_filename(sysdata[f],name,NULL); - trace("Checking for %s",filename); + gchar *filename; + + // Check for product dir + filename = g_build_filename(sysdata[f],G_STRINGIFY(PRODUCT_NAME),name,NULL); + trace("Checking for system data \"%s\"",filename); + if(g_file_test(filename,G_FILE_TEST_IS_REGULAR)) + return filename; + g_free(filename); + + // Check for file + filename = g_build_filename(sysdata[f],name,NULL); + trace("Checking for system data \"%s\"",filename); if(g_file_test(filename,G_FILE_TEST_IS_REGULAR)) return filename; g_free(filename); + + + } // -- libgit2 0.21.2