Download as
Browse Code »

Commit af9d19d5b9af02db0ebd6f08b726cbd5653f8356

Authored by Perry Werneck
1 parent 93db91f2
Exists in v5.2

Fixing detection of the default config based on product_name.

Showing 1 changed file with 17 additions and 4 deletions   Show diff stats
src/pw3270/common/config.c
  Diff comments   View file @af9d19d
... ... @@ -222,9 +222,9 @@
222 222 // Search the application DATADIR
223 223 //
224 224 {
225   - gchar *filename = g_build_filename(DATAROOTDIR,PACKAGE_NAME,name,NULL);
  225 + gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL);
226 226  
227   - trace("Checking for %s",filename);
  227 + trace("Checking for default config \"%s\"",filename);
228 228  
229 229 if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
230 230 return filename;
... ... @@ -255,11 +255,24 @@
255 255 const gchar * const * sysdata = g_get_system_data_dirs();
256 256 for(f=0;sysdata[f];f++)
257 257 {
258   - gchar *filename = g_build_filename(sysdata[f],name,NULL);
259   - trace("Checking for %s",filename);
  258 + gchar *filename;
  259 +
  260 + // Check for product dir
  261 + filename = g_build_filename(sysdata[f],G_STRINGIFY(PRODUCT_NAME),name,NULL);
  262 + trace("Checking for system data \"%s\"",filename);
  263 + if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
  264 + return filename;
  265 + g_free(filename);
  266 +
  267 + // Check for file
  268 + filename = g_build_filename(sysdata[f],name,NULL);
  269 + trace("Checking for system data \"%s\"",filename);
260 270 if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
261 271 return filename;
262 272 g_free(filename);
  273 +
  274 +
  275 +
263 276 }
264 277  
265 278 //
... ...