Mercurial > geeqie.yaz

comparison src/options.c @ 1313:1ffa5222dc61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
enabled commandline again
author nadvornik
date Mon, 23 Feb 2009 21:21:15 +0000
parents 55ea4962887a
children cd7204a18f14
comparison
equal deleted inserted replaced
1312:fcf0e7a6143e 1313:1ffa5222dc61
256 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL); 256 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
257 save_options_to(rc_path, options); 257 save_options_to(rc_path, options);
258 g_free(rc_path); 258 g_free(rc_path);
259 } 259 }
260 260
261 void load_options(ConfOptions *options) 261 gboolean load_options(ConfOptions *options)
262 { 262 {
263 gboolean success; 263 gboolean success;
264 gchar *rc_path; 264 gchar *rc_path;
265 265
266 if (isdir(GQ_SYSTEM_WIDE_DIR)) 266 if (isdir(GQ_SYSTEM_WIDE_DIR))
267 { 267 {
268 rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL); 268 rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL);
269 success = load_options_from(rc_path, options); 269 success = load_options_from(rc_path, options, TRUE);
270 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed"); 270 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
271 g_free(rc_path); 271 g_free(rc_path);
272 } 272 }
273 273
274 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL); 274 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
275 success = load_options_from(rc_path, options); 275 success = load_options_from(rc_path, options, TRUE);
276 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed"); 276 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
277 g_free(rc_path); 277 g_free(rc_path);
278 return(success);
278 } 279 }
279 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ 280 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */