Mercurial > geeqie

diff src/main.c @ 614:b2898f04c82e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
image_osd_get() and image_osd_set() now uses flags.
author zas_
date Fri, 09 May 2008 09:58:46 +0000
parents 905688aa2317
children b1a922a32d9c
line wrap: on
line diff
--- a/src/main.c	Fri May 09 09:34:38 2008 +0000
+++ b/src/main.c	Fri May 09 09:58:46 2008 +0000
@@ -1208,7 +1208,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->image_overlay.common.enabled = image_osd_get(lw->image, NULL, NULL);
+		options->image_overlay.common.enabled = image_osd_get(lw->image, NULL);
 		}
 
 	layout_geometry_get_dividers(NULL, &options->layout.main_window.hdivider_pos, &options->layout.main_window.vdivider_pos);
@@ -1479,7 +1479,8 @@
 						    collection_get_first(first_collection));
 			}
 		}
-	image_osd_set(lw->image, FALSE, (options->image_overlay.common.show_at_startup || options->image_overlay.common.enabled));
+
+	image_osd_set(lw->image, (options->image_overlay.common.show_at_startup || options->image_overlay.common.enabled) ? OSD_SHOW_INFO : OSD_SHOW_NOTHING);
 
 	g_free(geometry);
 	g_free(cmd_path);