Commit 4e9a506b0f4a49aa15f6dcdfbfcf9f9108eba040
1 parent
50d0aa50
Exists in
master
and in
5 other branches
Fixing 'missing sentinel error' detected by OBS.
Showing
2 changed files
with
8 additions
and
6 deletions
Show diff stats
pw3270.cbp
| @@ -286,9 +286,6 @@ | @@ -286,9 +286,6 @@ | ||
| 286 | <Unit filename="src/pw3270/tools.c"> | 286 | <Unit filename="src/pw3270/tools.c"> |
| 287 | <Option compilerVar="CC" /> | 287 | <Option compilerVar="CC" /> |
| 288 | </Unit> | 288 | </Unit> |
| 289 | - <Unit filename="src/pw3270/trace.c"> | ||
| 290 | - <Option compilerVar="CC" /> | ||
| 291 | - </Unit> | ||
| 292 | <Unit filename="src/pw3270/uiparser/Makefile.in" /> | 289 | <Unit filename="src/pw3270/uiparser/Makefile.in" /> |
| 293 | <Unit filename="src/pw3270/uiparser/accelerator.c"> | 290 | <Unit filename="src/pw3270/uiparser/accelerator.c"> |
| 294 | <Option compilerVar="CC" /> | 291 | <Option compilerVar="CC" /> |
src/pw3270/common/config.c
| @@ -235,9 +235,8 @@ | @@ -235,9 +235,8 @@ | ||
| 235 | #endif // DATADIR | 235 | #endif // DATADIR |
| 236 | 236 | ||
| 237 | // | 237 | // |
| 238 | - // Search the system folders | 238 | + // Search the system config folders |
| 239 | // | 239 | // |
| 240 | - | ||
| 241 | const gchar * const * sysconfig = g_get_system_config_dirs(); | 240 | const gchar * const * sysconfig = g_get_system_config_dirs(); |
| 242 | for(f=0;sysconfig[f];f++) | 241 | for(f=0;sysconfig[f];f++) |
| 243 | { | 242 | { |
| @@ -248,6 +247,9 @@ | @@ -248,6 +247,9 @@ | ||
| 248 | g_free(filename); | 247 | g_free(filename); |
| 249 | } | 248 | } |
| 250 | 249 | ||
| 250 | + // | ||
| 251 | + // Search the system data folders | ||
| 252 | + // | ||
| 251 | const gchar * const * sysdata = g_get_system_data_dirs(); | 253 | const gchar * const * sysdata = g_get_system_data_dirs(); |
| 252 | for(f=0;sysdata[f];f++) | 254 | for(f=0;sysdata[f];f++) |
| 253 | { | 255 | { |
| @@ -258,7 +260,10 @@ | @@ -258,7 +260,10 @@ | ||
| 258 | g_free(filename); | 260 | g_free(filename); |
| 259 | } | 261 | } |
| 260 | 262 | ||
| 261 | - return g_build_filename(g_get_user_config_dir(),name); | 263 | + // |
| 264 | + // Can't find, use user config dir | ||
| 265 | + // | ||
| 266 | + return g_build_filename(g_get_user_config_dir(),name,NULL); | ||
| 262 | 267 | ||
| 263 | } | 268 | } |
| 264 | #endif // #ifdef HAVE_WIN_REGISTRY | 269 | #endif // #ifdef HAVE_WIN_REGISTRY |