Mercurial > geeqie.yaz

diff 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
line wrap: on
line diff
--- a/src/options.c	Mon Feb 23 17:20:40 2009 +0000
+++ b/src/options.c	Mon Feb 23 21:21:15 2009 +0000
@@ -258,7 +258,7 @@
 	g_free(rc_path);
 }
 
-void load_options(ConfOptions *options)
+gboolean load_options(ConfOptions *options)
 {
 	gboolean success;
 	gchar *rc_path;
@@ -266,14 +266,15 @@
 	if (isdir(GQ_SYSTEM_WIDE_DIR))
 		{
 		rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL);
-		success = load_options_from(rc_path, options);
+		success = load_options_from(rc_path, options, TRUE);
 		DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
 		g_free(rc_path);
 		}
 	
 	rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
-	success = load_options_from(rc_path, options);
+	success = load_options_from(rc_path, options, TRUE);
 	DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
 	g_free(rc_path);
+	return(success);
 }
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */