From 6178ce7ae0e76e7e4d348681969e6dd31235c8ad Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Mon, 7 Sep 2009 08:18:18 +0000 Subject: [PATCH] Remove an unused variable and minor code cleanup. --- src/layout_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layout_util.c b/src/layout_util.c index b1257aa1..e7515c58 100644 --- a/src/layout_util.c +++ b/src/layout_util.c @@ -661,8 +661,7 @@ static void layout_menu_overlay_toggle_cb(GtkAction *action, gpointer data) static void layout_menu_overlay_cb(GtkToggleAction *action, gpointer data) { LayoutWindow *lw = data; - GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram")); - + if (gtk_toggle_action_get_active(action)) { OsdShowFlags flags = image_osd_get(lw->image); @@ -672,6 +671,8 @@ static void layout_menu_overlay_cb(GtkToggleAction *action, gpointer data) } else { + GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram")); + image_osd_set(lw->image, OSD_SHOW_NOTHING); gtk_toggle_action_set_active(histogram_action, FALSE); /* this calls layout_menu_histogram_cb */ } @@ -680,7 +681,6 @@ static void layout_menu_overlay_cb(GtkToggleAction *action, gpointer data) static void layout_menu_histogram_cb(GtkToggleAction *action, gpointer data) { LayoutWindow *lw = data; - GtkToggleAction *overlay_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageOverlay")); if (gtk_toggle_action_get_active(action)) { -- 2.20.1