Move save/load_options() to options.[ch].

diff --git a/src/main.c b/src/main.c
index 78ed59c..51ff091 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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 --git a/src/options.c b/src/options.c
index 3296b32..7d42a27 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -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 @@ void setup_default_options(ConfOptions *options)
                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 @@ void sync_options_with_current_state(ConfOptions *options)
                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 --git a/src/options.h b/src/options.h
index 3a6a717..91f496f 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -258,6 +258,8 @@ ConfOptions *options;
 
 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 --git a/src/rcfile.c b/src/rcfile.c
index c117247..255460e 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -305,7 +305,7 @@ static gboolean read_bool_option(FILE *f, gchar *option, gchar *label, gchar *va
  *-----------------------------------------------------------------------------
  */
 
-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 @@ static gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
        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 @@ static gboolean is_numbered_option(const gchar *option, const gchar *prefix, gin
 
 #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 @@ static gboolean load_options_from(const gchar *utf8_path, ConfOptions *options)
        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 --git a/src/rcfile.h b/src/rcfile.h
index 325df3d..a565dd9 100644 (file)
--- a/src/rcfile.h
+++ b/src/rcfile.h
@@ -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