diff src/main.c @ 468:2df505c60459

Replace fullscreen.info and fullscreen.show_info options by: image_overlay.common.enabled => to save last state to rc file image_overlay.common.show_at_startup => overrides .common.enabled at startup image_overlay.common.template_string => replace fullscreen.info common is used since for now there is only one image overlay setup, later specific setups may be added.

--- a/src/main.c	Mon Apr 21 19:42:58 2008 +0000
+++ b/src/main.c	Mon Apr 21 20:01:22 2008 +0000
@@ -1261,7 +1261,7 @@
 			layout_geometry_get(NULL, &options->layout.main_window.x, &options->layout.main_window.y,
 					    &options->layout.main_window.w, &options->layout.main_window.h);
 			}
-		options->fullscreen.show_info = image_osd_get(lw->image, NULL, NULL);
+		options->image_overlay.common.enabled = image_osd_get(lw->image, NULL, NULL);
 		}
 
 	layout_geometry_get_dividers(NULL, &options->layout.main_window.hdivider_pos, &options->layout.main_window.vdivider_pos);
@@ -1532,7 +1532,7 @@
 						    collection_get_first(first_collection));
 			}
 		}
-	image_osd_set(lw->image, FALSE, options->fullscreen.show_info);
+	image_osd_set(lw->image, FALSE, (options->image_overlay.common.show_at_startup || options->image_overlay.common.enabled));
 
 	g_free(geometry);
 	g_free(cmd_path);