# HG changeset patch
# User zas_
# Date 1220174022 0
# Node ID 4aa1a62354587ba90c306bd07220e7d27cd1427a
# Parent  7789dff370865d53b9640d82a87af45cd8a7f903
Move save/load_options() to options.[ch].

diff -r 7789dff37086 -r 4aa1a6235458 src/main.c
--- a/src/main.c	Sun Aug 31 08:59:39 2008 +0000
+++ b/src/main.c	Sun Aug 31 09:13:42 2008 +0000
@@ -22,7 +22,7 @@
 #include "image-overlay.h"
 #include "layout.h"
 #include "layout_image.h"
-#include "rcfile.h"
+#include "options.h"
 #include "remote.h"
 #include "similar.h"
 #include "ui_fileops.h"
diff -r 7789dff37086 -r 4aa1a6235458 src/options.c
--- a/src/options.c	Sun Aug 31 08:59:39 2008 +0000
+++ b/src/options.c	Sun Aug 31 09:13:42 2008 +0000
@@ -20,6 +20,7 @@
 #include "info.h"
 #include "layout.h"
 #include "layout_image.h"
+#include "rcfile.h"
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "window.h"
@@ -209,7 +210,7 @@
 		ExifUIList[i].current = ExifUIList[i].default_value;
 }
 
-void sync_options_with_current_state(ConfOptions *options)
+static void sync_options_with_current_state(ConfOptions *options)
 {
 	LayoutWindow *lw = NULL;
 
@@ -251,3 +252,33 @@
 		options->startup.path = g_strdup(layout_get_path(NULL));
 		}
 }
+
+void save_options(ConfOptions *options)
+{
+	gchar *rc_path;
+
+	sync_options_with_current_state(options);
+
+	rc_path = g_build_filename(homedir(), GQ_RC_DIR, RC_FILE_NAME, NULL);
+	save_options_to(rc_path, options);
+	g_free(rc_path);
+}
+
+void load_options(ConfOptions *options)
+{
+	gboolean success;
+	gchar *rc_path;
+
+	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);
+		DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
+		g_free(rc_path);
+		}
+	
+	rc_path = g_build_filename(homedir(), GQ_RC_DIR, RC_FILE_NAME, NULL);
+	success = load_options_from(rc_path, options);
+	DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
+	g_free(rc_path);
+}
diff -r 7789dff37086 -r 4aa1a6235458 src/options.h
--- a/src/options.h	Sun Aug 31 08:59:39 2008 +0000
+++ b/src/options.h	Sun Aug 31 09:13:42 2008 +0000
@@ -258,6 +258,8 @@
 
 ConfOptions *init_options(ConfOptions *options);
 void setup_default_options(ConfOptions *options);
-void sync_options_with_current_state(ConfOptions *options);
+void save_options(ConfOptions *options);
+void load_options(ConfOptions *options);
+
 
 #endif /* OPTIONS_H */
diff -r 7789dff37086 -r 4aa1a6235458 src/rcfile.c
--- a/src/rcfile.c	Sun Aug 31 08:59:39 2008 +0000
+++ b/src/rcfile.c	Sun Aug 31 09:13:42 2008 +0000
@@ -305,7 +305,7 @@
  *-----------------------------------------------------------------------------
  */
 
-static gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
+gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
 {
 	SecureSaveInfo *ssi;
 	gchar *rc_pathl;
@@ -639,16 +639,6 @@
 	return TRUE;
 }
 
-void save_options(ConfOptions *options)
-{
-	gchar *rc_path;
-
-	sync_options_with_current_state(options);
-
-	rc_path = g_build_filename(homedir(), GQ_RC_DIR, RC_FILE_NAME, NULL);
-	save_options_to(rc_path, options);
-	g_free(rc_path);
-}
 
 
 
@@ -677,7 +667,7 @@
 
 #define OPTION_READ_BUFFER_SIZE 1024
 
-static gboolean load_options_from(const gchar *utf8_path, ConfOptions *options)
+gboolean load_options_from(const gchar *utf8_path, ConfOptions *options)
 {
 	FILE *f;
 	gchar *rc_pathl;
@@ -996,22 +986,3 @@
 	fclose(f);
 	return TRUE;
 }
-
-void load_options(ConfOptions *options)
-{
-	gboolean success;
-	gchar *rc_path;
-
-	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);
-		DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
-		g_free(rc_path);
-		}
-	
-	rc_path = g_build_filename(homedir(), GQ_RC_DIR, RC_FILE_NAME, NULL);
-	success = load_options_from(rc_path, options);
-	DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
-	g_free(rc_path);
-}
diff -r 7789dff37086 -r 4aa1a6235458 src/rcfile.h
--- a/src/rcfile.h	Sun Aug 31 08:59:39 2008 +0000
+++ b/src/rcfile.h	Sun Aug 31 09:13:42 2008 +0000
@@ -17,8 +17,7 @@
 gchar *quoted_value(const gchar *text, const gchar **tail);
 gchar *escquote_value(const gchar *text);
 
-void save_options(ConfOptions *options);
-void load_options(ConfOptions *options);
-
+gboolean save_options_to(const gchar *utf8_path, ConfOptions *options);
+gboolean load_options_from(const gchar *utf8_path, ConfOptions *options);
 
 #endif