Those stereo image options are of type int, not uint, use appropriate macros.

[geeqie.git] / src / rcfile.c

diff --git a/src/rcfile.c b/src/rcfile.c
index 6999380..39e6e58 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -74,6 +74,15 @@ void write_char_option(GString *str, gint indent, const gchar *label, const gcha
        g_free(escval1);
 }
 
+/* dummy read for old/obsolete/futur/deprecated/unused options */
+gboolean read_dummy_option(const gchar *option, const gchar *label, const gchar *message)
+{
+       if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
+       log_printf(_("Option %s ignored: %s\n"), option, message);
+       return TRUE;
+}
+
+
 gboolean read_char_option(const gchar *option, const gchar *label, const gchar *value, gchar **text)
 {
        if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
@@ -331,6 +340,7 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color);
        WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color_in_fullscreen);
        WRITE_NL(); WRITE_COLOR(*options, image.border_color);
+       WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
 
 //     WRITE_SUBTITLE("Thumbnails Options");
 
@@ -441,15 +451,15 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, metadata.keywords_case_sensitive);
        WRITE_NL(); WRITE_BOOL(*options, metadata.write_orientation);
 
-       WRITE_NL(); WRITE_UINT(*options, stereo.mode);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fsmode);
+       WRITE_NL(); WRITE_INT(*options, stereo.mode);
+       WRITE_NL(); WRITE_INT(*options, stereo.fsmode);
        WRITE_NL(); WRITE_BOOL(*options, stereo.enable_fsmode);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fixed_w);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fixed_h);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fixed_x1);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fixed_y1);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fixed_x2);
-       WRITE_NL(); WRITE_UINT(*options, stereo.fixed_y2);
+       WRITE_NL(); WRITE_INT(*options, stereo.fixed_w);
+       WRITE_NL(); WRITE_INT(*options, stereo.fixed_h);
+       WRITE_NL(); WRITE_INT(*options, stereo.fixed_x1);
+       WRITE_NL(); WRITE_INT(*options, stereo.fixed_y1);
+       WRITE_NL(); WRITE_INT(*options, stereo.fixed_x2);
+       WRITE_NL(); WRITE_INT(*options, stereo.fixed_y2);
 }
 
 static void write_color_profile(GString *outstr, gint indent)
@@ -623,6 +633,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, image.use_custom_border_color)) continue;
                if (READ_BOOL(*options, image.use_custom_border_color_in_fullscreen)) continue;
                if (READ_COLOR(*options, image.border_color)) continue;
+               if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
 
                /* thumbnails options */
                if (READ_INT_CLAMP(*options, thumbnails.max_width, 16, 512)) continue;
@@ -710,16 +721,20 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, metadata.keywords_case_sensitive)) continue;
                if (READ_BOOL(*options, metadata.write_orientation)) continue;
 
-               if (READ_UINT(*options, stereo.mode)) continue;
-               if (READ_UINT(*options, stereo.fsmode)) continue;
+               if (READ_INT(*options, stereo.mode)) continue;
+               if (READ_INT(*options, stereo.fsmode)) continue;
                if (READ_BOOL(*options, stereo.enable_fsmode)) continue;
-               if (READ_UINT(*options, stereo.fixed_w)) continue;
-               if (READ_UINT(*options, stereo.fixed_h)) continue;
-               if (READ_UINT(*options, stereo.fixed_x1)) continue;
-               if (READ_UINT(*options, stereo.fixed_y1)) continue;
-               if (READ_UINT(*options, stereo.fixed_x2)) continue;
-               if (READ_UINT(*options, stereo.fixed_y2)) continue;
+               if (READ_INT(*options, stereo.fixed_w)) continue;
+               if (READ_INT(*options, stereo.fixed_h)) continue;
+               if (READ_INT(*options, stereo.fixed_x1)) continue;
+               if (READ_INT(*options, stereo.fixed_y1)) continue;
+               if (READ_INT(*options, stereo.fixed_x2)) continue;
+               if (READ_INT(*options, stereo.fixed_y2)) continue;
+
+               /* dummy options */
+               if (READ_DUMMY(*options, image.dither_quality, "deprecated since 2012-08-13")) continue;
 
+               /* unknown options */
                log_printf("unknown attribute %s = %s\n", option, value);
                }