Fix int<->uint problem

[geeqie.git] / src / rcfile.c

diff --git a/src/rcfile.c b/src/rcfile.c
index cf2f474..9ed1342 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -335,6 +335,8 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, use_saved_window_positions_for_new_windows);
        WRITE_NL(); WRITE_BOOL(*options, tools_restore_state);
 
+       WRITE_NL(); WRITE_UINT(*options, log_window_lines);
+
        /* File operations Options */
        WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_in_place_rename);
        WRITE_NL(); WRITE_BOOL(*options, file_ops.confirm_delete);
@@ -463,6 +465,12 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_INT(*options, stereo.fixed_y1);
        WRITE_NL(); WRITE_INT(*options, stereo.fixed_x2);
        WRITE_NL(); WRITE_INT(*options, stereo.fixed_y2);
+
+       /* copy move rename */
+       WRITE_NL(); WRITE_INT(*options, cp_mv_rn.auto_start);
+       WRITE_NL(); WRITE_INT(*options, cp_mv_rn.auto_padding);
+       WRITE_NL(); WRITE_CHAR(*options, cp_mv_rn.auto_end);
+       WRITE_NL(); WRITE_INT(*options, cp_mv_rn.formatted_start);
 }
 
 static void write_color_profile(GString *outstr, gint indent)
@@ -623,6 +631,8 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, use_saved_window_positions_for_new_windows)) continue;
                if (READ_BOOL(*options, tools_restore_state)) continue;
 
+               if (READ_INT(*options, log_window_lines)) continue;
+
                /* Properties dialog options */
                if (READ_CHAR(*options, properties.tabs_order)) continue;
 
@@ -747,6 +757,12 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_INT(*options, stereo.fixed_x2)) continue;
                if (READ_INT(*options, stereo.fixed_y2)) continue;
 
+               /* copy move rename */
+               if (READ_INT(*options, cp_mv_rn.auto_start))  continue;
+               if (READ_INT(*options, cp_mv_rn.auto_padding)) continue;
+               if (READ_CHAR(*options, cp_mv_rn.auto_end)) continue;
+               if (READ_INT(*options, cp_mv_rn.formatted_start)) continue;
+
                /* Dummy options */
                if (READ_DUMMY(*options, image.dither_quality, "deprecated since 2012-08-13")) continue;