Rename option image_overlay.common.enabled to image_overlay.common.state

since it is not a boolean anymore.

diff --git a/src/main.c b/src/main.c
index d8681f5..5f5cf2d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1206,7 +1206,7 @@ static void exit_program_final(void)
                                            &options->layout.main_window.w, &options->layout.main_window.h);
                        }
 
-               options->image_overlay.common.enabled = image_osd_get(lw->image);
+               options->image_overlay.common.state = image_osd_get(lw->image);
                }
 
        layout_geometry_get_dividers(NULL, &options->layout.main_window.hdivider_pos, &options->layout.main_window.vdivider_pos);
@@ -1484,7 +1484,7 @@ int main(int argc, char *argv[])
                        }
                }
 
-       image_osd_set(lw->image, options->image_overlay.common.enabled | (options->image_overlay.common.show_at_startup ? OSD_SHOW_INFO : OSD_SHOW_NOTHING));
+       image_osd_set(lw->image, options->image_overlay.common.state | (options->image_overlay.common.show_at_startup ? OSD_SHOW_INFO : OSD_SHOW_NOTHING));
 
        g_free(geometry);
        g_free(cmd_path);

diff --git a/src/options.c b/src/options.c
index 61d9e27..14b643e 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -74,7 +74,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->image.zoom_quality = (gint)GDK_INTERP_BILINEAR;
        options->image.zoom_to_fit_allow_expand = TRUE;
 
-       options->image_overlay.common.enabled = (guint)OSD_SHOW_NOTHING;
+       options->image_overlay.common.state = (guint)OSD_SHOW_NOTHING;
        options->image_overlay.common.show_at_startup = FALSE;
        options->image_overlay.common.template_string = NULL;
 

diff --git a/src/options.h b/src/options.h
index 1b8386f..8eef3ea 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -142,7 +142,7 @@ struct _ConfOptions
        /* image overlay */
        struct {
                struct {
-                       guint enabled;
+                       guint state;
                        gint show_at_startup;
                        gchar *template_string;
                } common;

diff --git a/src/rcfile.c b/src/rcfile.c
index 4d633c0..2d22fee 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -452,7 +452,7 @@ void save_options(void)
 
 
        WRITE_SUBTITLE("Image Overlay Options");
-       WRITE_UINT(image_overlay.common.enabled);
+       WRITE_UINT(image_overlay.common.state);
        WRITE_BOOL(image_overlay.common.show_at_startup);
        WRITE_CHAR(image_overlay.common.template_string);
 
@@ -760,12 +760,13 @@ void load_options(void)
                READ_UINT(histogram.last_log_mode);
 
                /* image overlay */
-               COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup);
-               COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string);
-               READ_UINT(image_overlay.common.enabled);
+               COMPAT_READ_UINT(image_overlay.common.enabled, image_overlay.common.state); /* 2008-05-12 */ 
+               READ_UINT(image_overlay.common.state);
+               COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup); /* 2008-04-21 */
                READ_BOOL(image_overlay.common.show_at_startup);
+               COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string); /* 2008-04-21 */
                READ_CHAR(image_overlay.common.template_string);
-       
+
                /* slideshow options */
                READ_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
                READ_BOOL(slideshow.random);