GTK2 no longer supported

[geeqie.git] / src / layout_util.c

diff --git a/src/layout_util.c b/src/layout_util.c
index 40316dd..a676672 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -221,23 +221,23 @@ static void layout_exit_fullscreen(LayoutWindow *lw)
        layout_image_full_screen_stop(lw);
 }
 
-static void clear_marks_cancel_cb(GenericDialog *gd, gpointer data)
+static void clear_marks_cancel_cb(GenericDialog *gd, gpointer UNUSED(data))
 {
        generic_dialog_close(gd);
 }
 
-static void clear_marks_help_cb(GenericDialog *gd, gpointer data)
+static void clear_marks_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
 {
        help_window_show("GuideMainWindowMenus.html");
 }
 
-void layout_menu_clear_marks_ok_cb(GenericDialog *gd, gpointer data)
+void layout_menu_clear_marks_ok_cb(GenericDialog *gd, gpointer UNUSED(data))
 {
        marks_clear_all();
        generic_dialog_close(gd);
 }
 
-static void layout_menu_clear_marks_cb(GtkAction *action, gpointer data)
+static void layout_menu_clear_marks_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
 {
        GenericDialog *gd;
 
@@ -253,7 +253,7 @@ static void layout_menu_clear_marks_cb(GtkAction *action, gpointer data)
        gtk_widget_show(gd->dialog);
 }
 
-static void layout_menu_new_cb(GtkAction *action, gpointer data)
+static void layout_menu_new_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -261,7 +261,7 @@ static void layout_menu_new_cb(GtkAction *action, gpointer data)
        collection_window_new(NULL);
 }
 
-static void layout_menu_open_cb(GtkAction *action, gpointer data)
+static void layout_menu_open_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -269,7 +269,7 @@ static void layout_menu_open_cb(GtkAction *action, gpointer data)
        collection_dialog_load(NULL);
 }
 
-static void layout_menu_search_cb(GtkAction *action, gpointer data)
+static void layout_menu_search_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -277,7 +277,7 @@ static void layout_menu_search_cb(GtkAction *action, gpointer data)
        search_new(lw->dir_fd, layout_image_get_fd(lw));
 }
 
-static void layout_menu_dupes_cb(GtkAction *action, gpointer data)
+static void layout_menu_dupes_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -285,7 +285,7 @@ static void layout_menu_dupes_cb(GtkAction *action, gpointer data)
        dupe_window_new();
 }
 
-static void layout_menu_pan_cb(GtkAction *action, gpointer data)
+static void layout_menu_pan_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -293,56 +293,56 @@ static void layout_menu_pan_cb(GtkAction *action, gpointer data)
        pan_window_new(lw->dir_fd);
 }
 
-static void layout_menu_print_cb(GtkAction *action, gpointer data)
+static void layout_menu_print_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        print_window_new(layout_image_get_fd(lw), layout_selection_list(lw), layout_list(lw), layout_window(lw));
 }
 
-static void layout_menu_dir_cb(GtkAction *action, gpointer data)
+static void layout_menu_dir_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        if (lw->vd) vd_new_folder(lw->vd, lw->dir_fd);
 }
 
-static void layout_menu_copy_cb(GtkAction *action, gpointer data)
+static void layout_menu_copy_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_util_copy(NULL, layout_selection_list(lw), NULL, layout_window(lw));
 }
 
-static void layout_menu_copy_path_cb(GtkAction *action, gpointer data)
+static void layout_menu_copy_path_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_util_copy_path_list_to_clipboard(layout_selection_list(lw), TRUE);
 }
 
-static void layout_menu_copy_path_unquoted_cb(GtkAction *action, gpointer data)
+static void layout_menu_copy_path_unquoted_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_util_copy_path_list_to_clipboard(layout_selection_list(lw), FALSE);
 }
 
-static void layout_menu_move_cb(GtkAction *action, gpointer data)
+static void layout_menu_move_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_util_move(NULL, layout_selection_list(lw), NULL, layout_window(lw));
 }
 
-static void layout_menu_rename_cb(GtkAction *action, gpointer data)
+static void layout_menu_rename_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_util_rename(NULL, layout_selection_list(lw), layout_window(lw));
 }
 
-static void layout_menu_delete_cb(GtkAction *action, gpointer data)
+static void layout_menu_delete_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -350,7 +350,7 @@ static void layout_menu_delete_cb(GtkAction *action, gpointer data)
        file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
 }
 
-static void layout_menu_move_to_trash_cb(GtkAction *action, gpointer data)
+static void layout_menu_move_to_trash_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -358,7 +358,7 @@ static void layout_menu_move_to_trash_cb(GtkAction *action, gpointer data)
        file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
 }
 
-static void layout_menu_move_to_trash_key_cb(GtkAction *action, gpointer data)
+static void layout_menu_move_to_trash_key_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -369,21 +369,21 @@ static void layout_menu_move_to_trash_key_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_disable_grouping_cb(GtkAction *action, gpointer data)
+static void layout_menu_disable_grouping_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_data_disable_grouping_list(layout_selection_list(lw), TRUE);
 }
 
-static void layout_menu_enable_grouping_cb(GtkAction *action, gpointer data)
+static void layout_menu_enable_grouping_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        file_data_disable_grouping_list(layout_selection_list(lw), FALSE);
 }
 
-void layout_menu_close_cb(GtkAction *action, gpointer data)
+void layout_menu_close_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -391,89 +391,89 @@ void layout_menu_close_cb(GtkAction *action, gpointer data)
        layout_close(lw);
 }
 
-static void layout_menu_exit_cb(GtkAction *action, gpointer data)
+static void layout_menu_exit_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
 {
        exit_program();
 }
 
-static void layout_menu_alter_90_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_90_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_alter_orientation(lw, ALTER_ROTATE_90);
 }
 
-static void layout_menu_rating_0_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_0_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "0");
 }
 
-static void layout_menu_rating_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "1");
 }
 
-static void layout_menu_rating_2_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_2_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "2");
 }
 
-static void layout_menu_rating_3_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_3_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "3");
 }
 
-static void layout_menu_rating_4_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_4_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "4");
 }
 
-static void layout_menu_rating_5_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_5_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "5");
 }
 
-static void layout_menu_rating_m1_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_m1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_rating(lw, "-1");
 }
 
-static void layout_menu_alter_90cc_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_90cc_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_alter_orientation(lw, ALTER_ROTATE_90_CC);
 }
 
-static void layout_menu_alter_180_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_180_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_alter_orientation(lw, ALTER_ROTATE_180);
 }
 
-static void layout_menu_alter_mirror_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_mirror_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_alter_orientation(lw, ALTER_MIRROR);
 }
 
-static void layout_menu_alter_flip_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_flip_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -496,7 +496,7 @@ static void layout_menu_alter_ignore_alpha_cb(GtkToggleAction *action, gpointer
    layout_image_set_ignore_alpha(lw, gtk_toggle_action_get_active(action));
 }
 
-static void layout_menu_alter_none_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_none_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -511,7 +511,7 @@ static void layout_menu_exif_rotate_cb(GtkToggleAction *action, gpointer data)
        layout_image_reset_orientation(lw);
 }
 
-static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer data)
+static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer UNUSED(data))
 {
        options->draw_rectangle = gtk_toggle_action_get_active(action);
 }
@@ -530,7 +530,7 @@ static void layout_menu_select_overunderexposed_cb(GtkToggleAction *action, gpoi
        layout_image_set_overunderexposed(lw, gtk_toggle_action_get_active(action));
 }
 
-static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gboolean keep_date)
+static void layout_menu_write_rotate(GtkToggleAction *UNUSED(action), gpointer data, gboolean keep_date)
 {
        LayoutWindow *lw = data;
        GtkTreeModel *store;
@@ -631,7 +631,7 @@ static void layout_menu_write_rotate_cb(GtkToggleAction *action, gpointer data)
        layout_menu_write_rotate(action, data, FALSE);
 }
 
-static void layout_menu_config_cb(GtkAction *action, gpointer data)
+static void layout_menu_config_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -639,7 +639,7 @@ static void layout_menu_config_cb(GtkAction *action, gpointer data)
        show_config_window(lw);
 }
 
-static void layout_menu_editors_cb(GtkAction *action, gpointer data)
+static void layout_menu_editors_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -647,7 +647,7 @@ static void layout_menu_editors_cb(GtkAction *action, gpointer data)
        show_editor_list_window();
 }
 
-static void layout_menu_layout_config_cb(GtkAction *action, gpointer data)
+static void layout_menu_layout_config_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -655,7 +655,7 @@ static void layout_menu_layout_config_cb(GtkAction *action, gpointer data)
        layout_show_config_window(lw);
 }
 
-static void layout_menu_remove_thumb_cb(GtkAction *action, gpointer data)
+static void layout_menu_remove_thumb_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -663,7 +663,7 @@ static void layout_menu_remove_thumb_cb(GtkAction *action, gpointer data)
        cache_manager_show();
 }
 
-static void layout_menu_wallpaper_cb(GtkAction *action, gpointer data)
+static void layout_menu_wallpaper_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -671,83 +671,83 @@ static void layout_menu_wallpaper_cb(GtkAction *action, gpointer data)
 }
 
 /* single window zoom */
-static void layout_menu_zoom_in_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_in_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE);
 }
 
-static void layout_menu_zoom_out_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_out_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE);
 }
 
-static void layout_menu_zoom_1_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 1.0, FALSE);
 }
 
-static void layout_menu_zoom_fit_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_fit_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 0.0, FALSE);
 }
 
-static void layout_menu_zoom_fit_hor_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_fit_hor_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set_fill_geometry(lw, FALSE, FALSE);
 }
 
-static void layout_menu_zoom_fit_vert_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_fit_vert_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set_fill_geometry(lw, TRUE, FALSE);
 }
 
-static void layout_menu_zoom_2_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_2_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 2.0, FALSE);
 }
 
-static void layout_menu_zoom_3_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_3_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 3.0, FALSE);
 }
-static void layout_menu_zoom_4_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_4_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 4.0, FALSE);
 }
 
-static void layout_menu_zoom_1_2_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_2_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, -2.0, FALSE);
 }
 
-static void layout_menu_zoom_1_3_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_3_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, -3.0, FALSE);
 }
 
-static void layout_menu_zoom_1_4_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -755,83 +755,83 @@ static void layout_menu_zoom_1_4_cb(GtkAction *action, gpointer data)
 }
 
 /* connected zoom */
-static void layout_menu_connect_zoom_in_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_in_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_adjust(lw, get_zoom_increment(), TRUE);
 }
 
-static void layout_menu_connect_zoom_out_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_out_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_adjust(lw, -get_zoom_increment(), TRUE);
 }
 
-static void layout_menu_connect_zoom_1_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 1.0, TRUE);
 }
 
-static void layout_menu_connect_zoom_fit_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_fit_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 0.0, TRUE);
 }
 
-static void layout_menu_connect_zoom_fit_hor_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_fit_hor_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set_fill_geometry(lw, FALSE, TRUE);
 }
 
-static void layout_menu_connect_zoom_fit_vert_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_fit_vert_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set_fill_geometry(lw, TRUE, TRUE);
 }
 
-static void layout_menu_connect_zoom_2_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_2_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 2.0, TRUE);
 }
 
-static void layout_menu_connect_zoom_3_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_3_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 3.0, TRUE);
 }
-static void layout_menu_connect_zoom_4_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_4_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, 4.0, TRUE);
 }
 
-static void layout_menu_connect_zoom_1_2_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_2_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, -2.0, TRUE);
 }
 
-static void layout_menu_connect_zoom_1_3_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_3_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_zoom_set(lw, -3.0, TRUE);
 }
 
-static void layout_menu_connect_zoom_1_4_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -839,7 +839,7 @@ static void layout_menu_connect_zoom_1_4_cb(GtkAction *action, gpointer data)
 }
 
 
-static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
        LayoutWindow *lw = data;
        ImageSplitMode mode;
@@ -858,7 +858,7 @@ static void layout_menu_thumb_cb(GtkToggleAction *action, gpointer data)
 }
 
 
-static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -882,7 +882,7 @@ static void layout_menu_view_dir_as_cb(GtkToggleAction *action,  gpointer data)
                }
 }
 
-static void layout_menu_view_in_new_window_cb(GtkAction *action, gpointer data)
+static void layout_menu_view_in_new_window_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -890,7 +890,7 @@ static void layout_menu_view_in_new_window_cb(GtkAction *action, gpointer data)
        view_window_new(layout_image_get_fd(lw));
 }
 
-static void layout_menu_open_archive_cb(GtkAction *action, gpointer data)
+static void layout_menu_open_archive_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        LayoutWindow *lw_new;
@@ -916,21 +916,21 @@ static void layout_menu_open_archive_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_fullscreen_cb(GtkAction *action, gpointer data)
+static void layout_menu_fullscreen_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_full_screen_toggle(lw);
 }
 
-static void layout_menu_escape_cb(GtkAction *action, gpointer data)
+static void layout_menu_escape_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_exit_fullscreen(lw);
 }
 
-static void layout_menu_overlay_toggle_cb(GtkAction *action, gpointer data)
+static void layout_menu_overlay_toggle_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -984,12 +984,12 @@ static void layout_menu_animate_cb(GtkToggleAction *action, gpointer data)
        layout_image_animate_toggle(lw);
 }
 
-static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpointer data)
+static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpointer UNUSED(data))
 {
        options->collections.rectangular_selection = gtk_toggle_action_get_active(action);
 }
 
-static void layout_menu_histogram_toggle_channel_cb(GtkAction *action, gpointer data)
+static void layout_menu_histogram_toggle_channel_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -997,7 +997,7 @@ static void layout_menu_histogram_toggle_channel_cb(GtkAction *action, gpointer
        layout_util_sync_views(lw);
 }
 
-static void layout_menu_histogram_toggle_mode_cb(GtkAction *action, gpointer data)
+static void layout_menu_histogram_toggle_mode_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1005,7 +1005,7 @@ static void layout_menu_histogram_toggle_mode_cb(GtkAction *action, gpointer dat
        layout_util_sync_views(lw);
 }
 
-static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
        LayoutWindow *lw = data;
        gint channel = gtk_radio_action_get_current_value(action);
@@ -1017,7 +1017,7 @@ static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAct
        image_osd_histogram_set_channel(lw->image, channel);
 }
 
-static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
        LayoutWindow *lw = data;
        gint mode = gtk_radio_action_get_current_value(action);
@@ -1029,14 +1029,14 @@ static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction
        image_osd_histogram_set_mode(lw->image, mode);
 }
 
-static void layout_menu_refresh_cb(GtkAction *action, gpointer data)
+static void layout_menu_refresh_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_refresh(lw);
 }
 
-static void layout_menu_bar_exif_cb(GtkAction *action, gpointer data)
+static void layout_menu_bar_exif_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1044,7 +1044,7 @@ static void layout_menu_bar_exif_cb(GtkAction *action, gpointer data)
        layout_exif_window_new(lw);
 }
 
-static void layout_menu_search_and_run_cb(GtkAction *action, gpointer data)
+static void layout_menu_search_and_run_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1063,7 +1063,7 @@ static void layout_menu_float_cb(GtkToggleAction *action, gpointer data)
        layout_tools_float_toggle(lw);
 }
 
-static void layout_menu_hide_cb(GtkAction *action, gpointer data)
+static void layout_menu_hide_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1131,21 +1131,21 @@ static void layout_menu_slideshow_cb(GtkToggleAction *action, gpointer data)
        layout_image_slideshow_toggle(lw);
 }
 
-static void layout_menu_slideshow_pause_cb(GtkAction *action, gpointer data)
+static void layout_menu_slideshow_pause_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_image_slideshow_pause_toggle(lw);
 }
 
-static void layout_menu_slideshow_slower_cb(GtkAction *action, gpointer data)
+static void layout_menu_slideshow_slower_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
 {
        options->slideshow.delay = options->slideshow.delay + 5;
        if (options->slideshow.delay > SLIDESHOW_MAX_SECONDS)
                options->slideshow.delay = SLIDESHOW_MAX_SECONDS;
 }
 
-static void layout_menu_slideshow_faster_cb(GtkAction *action, gpointer data)
+static void layout_menu_slideshow_faster_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
 {
        options->slideshow.delay = options->slideshow.delay - 5;
        if (options->slideshow.delay < SLIDESHOW_MIN_SECONDS * 10)
@@ -1153,7 +1153,7 @@ static void layout_menu_slideshow_faster_cb(GtkAction *action, gpointer data)
 }
 
 
-static void layout_menu_stereo_mode_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_stereo_mode_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        gint mode = layout_image_stereo_pixbuf_get(lw);
@@ -1171,14 +1171,14 @@ static void layout_menu_stereo_mode_next_cb(GtkAction *action, gpointer data)
 
 }
 
-static void layout_menu_stereo_mode_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_stereo_mode_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
        LayoutWindow *lw = data;
        gint mode = gtk_radio_action_get_current_value(action);
        layout_image_stereo_pixbuf_set(lw, mode);
 }
 
-static void layout_menu_help_cb(GtkAction *action, gpointer data)
+static void layout_menu_help_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1186,7 +1186,7 @@ static void layout_menu_help_cb(GtkAction *action, gpointer data)
        help_window_show("index.html");
 }
 
-static void layout_menu_help_search_cb(GtkAction *action, gpointer data)
+static void layout_menu_help_search_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1194,7 +1194,7 @@ static void layout_menu_help_search_cb(GtkAction *action, gpointer data)
        help_search_window_show();
 }
 
-static void layout_menu_help_keys_cb(GtkAction *action, gpointer data)
+static void layout_menu_help_keys_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1202,7 +1202,7 @@ static void layout_menu_help_keys_cb(GtkAction *action, gpointer data)
        help_window_show("GuideReferenceKeyboardShortcuts.html");
 }
 
-static void layout_menu_notes_cb(GtkAction *action, gpointer data)
+static void layout_menu_notes_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1210,7 +1210,7 @@ static void layout_menu_notes_cb(GtkAction *action, gpointer data)
        help_window_show("release_notes");
 }
 
-static void layout_menu_changelog_cb(GtkAction *action, gpointer data)
+static void layout_menu_changelog_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1253,7 +1253,7 @@ static void layout_menu_foreach_func(
                                        const gchar *accel_path,
                                        guint accel_key,
                                        GdkModifierType accel_mods,
-                                       gboolean changed)
+                                       gboolean UNUSED(changed))
 {
        gchar *path, *name;
        gchar *key_name, *menu_name;
@@ -1289,7 +1289,7 @@ static void layout_menu_foreach_func(
        g_free(path);
 }
 
-static void layout_menu_kbd_map_cb(GtkAction *action, gpointer data)
+static void layout_menu_kbd_map_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
 {
        gint fd = -1;
        GPtrArray *array;
@@ -1380,7 +1380,7 @@ static void layout_menu_kbd_map_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_about_cb(GtkAction *action, gpointer data)
+static void layout_menu_about_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1388,7 +1388,7 @@ static void layout_menu_about_cb(GtkAction *action, gpointer data)
        show_about_window(lw);
 }
 
-static void layout_menu_log_window_cb(GtkAction *action, gpointer data)
+static void layout_menu_log_window_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1403,21 +1403,21 @@ static void layout_menu_log_window_cb(GtkAction *action, gpointer data)
  *-----------------------------------------------------------------------------
  */
 
-static void layout_menu_select_all_cb(GtkAction *action, gpointer data)
+static void layout_menu_select_all_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_select_all(lw);
 }
 
-static void layout_menu_unselect_all_cb(GtkAction *action, gpointer data)
+static void layout_menu_unselect_all_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_select_none(lw);
 }
 
-static void layout_menu_invert_selection_cb(GtkAction *action, gpointer data)
+static void layout_menu_invert_selection_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1519,13 +1519,13 @@ static void layout_menu_mark_filter_toggle_cb(GtkAction *action, gpointer data)
  *-----------------------------------------------------------------------------
  */
 
-static void layout_menu_image_first_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_first_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        layout_image_first(lw);
 }
 
-static void layout_menu_image_prev_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_prev_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        gint i;
@@ -1551,7 +1551,7 @@ static void layout_menu_image_prev_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_image_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        gint i;
@@ -1577,7 +1577,7 @@ static void layout_menu_image_next_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_page_first_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_first_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        FileData *fd = layout_image_get_fd(lw);
@@ -1588,7 +1588,7 @@ static void layout_menu_page_first_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_page_last_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_last_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        FileData *fd = layout_image_get_fd(lw);
@@ -1599,7 +1599,7 @@ static void layout_menu_page_last_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_page_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        FileData *fd = layout_image_get_fd(lw);
@@ -1610,7 +1610,7 @@ static void layout_menu_page_next_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_page_previous_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_previous_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        FileData *fd = layout_image_get_fd(lw);
@@ -1621,7 +1621,7 @@ static void layout_menu_page_previous_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_image_forward_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_forward_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1629,7 +1629,7 @@ static void layout_menu_image_forward_cb(GtkAction *action, gpointer data)
        layout_set_path(lw, image_chain_forward());
 }
 
-static void layout_menu_image_back_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_back_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -1637,7 +1637,7 @@ static void layout_menu_image_back_cb(GtkAction *action, gpointer data)
        layout_set_path(lw, image_chain_back());
 }
 
-static void layout_menu_split_pane_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_split_pane_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        gint active_frame;
@@ -1655,7 +1655,7 @@ static void layout_menu_split_pane_next_cb(GtkAction *action, gpointer data)
        layout_image_activate(lw, active_frame, FALSE);
 }
 
-static void layout_menu_split_pane_prev_cb(GtkAction *action, gpointer data)
+static void layout_menu_split_pane_prev_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        gint active_frame;
@@ -1677,7 +1677,7 @@ static void layout_menu_split_pane_prev_cb(GtkAction *action, gpointer data)
        layout_image_activate(lw, active_frame, FALSE);
 }
 
-static void layout_menu_split_pane_updown_cb(GtkAction *action, gpointer data)
+static void layout_menu_split_pane_updown_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        gint active_frame;
@@ -1695,13 +1695,13 @@ static void layout_menu_split_pane_updown_cb(GtkAction *action, gpointer data)
        layout_image_activate(lw, active_frame, FALSE);
 }
 
-static void layout_menu_image_last_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_last_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        layout_image_last(lw);
 }
 
-static void layout_menu_back_cb(GtkAction *action, gpointer data)
+static void layout_menu_back_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        FileData *dir_fd;
@@ -1712,7 +1712,7 @@ static void layout_menu_back_cb(GtkAction *action, gpointer data)
        file_data_unref(dir_fd);
 }
 
-static void layout_menu_forward_cb(GtkAction *action, gpointer data)
+static void layout_menu_forward_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        FileData *dir_fd;
@@ -1723,7 +1723,7 @@ static void layout_menu_forward_cb(GtkAction *action, gpointer data)
        file_data_unref(dir_fd);
 }
 
-static void layout_menu_home_cb(GtkAction *action, gpointer data)
+static void layout_menu_home_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        const gchar *path;
@@ -1741,7 +1741,7 @@ static void layout_menu_home_cb(GtkAction *action, gpointer data)
                }
 }
 
-static void layout_menu_up_cb(GtkAction *action, gpointer data)
+static void layout_menu_up_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        ViewDir *vd = lw->vd;
@@ -1779,13 +1779,13 @@ static void layout_menu_edit_cb(GtkAction *action, gpointer data)
 }
 
 
-static void layout_menu_metadata_write_cb(GtkAction *action, gpointer data)
+static void layout_menu_metadata_write_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
 {
        metadata_write_queue_confirm(TRUE, NULL, NULL);
 }
 
 static GtkWidget *last_focussed = NULL;
-static void layout_menu_keyword_autocomplete_cb(GtkAction *action, gpointer data)
+static void layout_menu_keyword_autocomplete_cb(GtkAction *UNUSED(action), gpointer data)
 {
        LayoutWindow *lw = data;
        GtkWidget *tmp;
@@ -1838,7 +1838,7 @@ static void layout_color_menu_use_image_cb(GtkToggleAction *action, gpointer dat
 #endif
 }
 
-static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
 #ifdef HAVE_LCMS
        LayoutWindow *lw = data;
@@ -1864,7 +1864,7 @@ static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *c
  *-----------------------------------------------------------------------------
  */
 
-static void layout_menu_recent_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_recent_cb(GtkWidget *widget, gpointer UNUSED(data))
 {
        gint n;
        gchar *path;
@@ -2050,7 +2050,7 @@ static GList *layout_window_menu_list(GList *listin)
        return g_list_sort(listin, layout_window_menu_list_sort_cb);
 }
 
-static void layout_menu_new_window_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        gint n;
 
@@ -2114,7 +2114,7 @@ static void layout_menu_new_window_update(LayoutWindow *lw)
                }
 }
 
-static void window_rename_cancel_cb(GenericDialog *gd, gpointer data)
+static void window_rename_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
        RenameWindow *rw = data;
 
@@ -2122,7 +2122,7 @@ static void window_rename_cancel_cb(GenericDialog *gd, gpointer data)
        g_free(rw);
 }
 
-static void window_rename_ok(GenericDialog *gd, gpointer data)
+static void window_rename_ok(GenericDialog *UNUSED(gd), gpointer data)
 {
        RenameWindow *rw = data;
        gchar *path;
@@ -2189,14 +2189,14 @@ static void window_rename_entry_activate_cb(GenericDialog *gd, gpointer data)
        window_rename_ok(gd, rw);
 }
 
-static void window_delete_cancel_cb(GenericDialog *gd, gpointer data)
+static void window_delete_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
        DeleteWindow *dw = data;
 
        g_free(dw);
 }
 
-static void window_delete_ok_cb(GenericDialog *gd, gpointer data)
+static void window_delete_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
        DeleteWindow *dw = data;
        gchar *path;
@@ -2216,12 +2216,12 @@ static void window_delete_ok_cb(GenericDialog *gd, gpointer data)
        g_free(path);
 }
 
-static void layout_menu_window_default_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_default_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
 {
        layout_new_from_default();
 }
 
-static void layout_menu_windows_menu_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_windows_menu_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
        GtkWidget *menu;
@@ -2251,7 +2251,7 @@ static void layout_menu_windows_menu_cb(GtkWidget *widget, gpointer data)
                }
 }
 
-static void layout_menu_view_menu_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_view_menu_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
        GtkWidget *menu;
@@ -2338,7 +2338,7 @@ static void change_window_id(const gchar *infile, const gchar *outfile)
        g_object_unref(in_file);
 }
 
-static void layout_menu_window_from_current_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_from_current_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
        gint fd_in = -1;
@@ -2374,14 +2374,14 @@ static void layout_menu_window_from_current_cb(GtkWidget *widget, gpointer data)
        g_free(tmp_file_out);
 }
 
-static void layout_menu_window_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
 
        layout_menu_new_window_update(lw);
 }
 
-static void layout_menu_window_rename_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
        RenameWindow *rw;
@@ -2412,7 +2412,7 @@ static void layout_menu_window_rename_cb(GtkWidget *widget, gpointer data)
        gtk_widget_show(rw->gd->dialog);
 }
 
-static void layout_menu_window_delete_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
        DeleteWindow *dw;
@@ -2784,9 +2784,6 @@ static const gchar *menu_ui_description =
 "      <menuitem action='Maintenance'/>"
 "      <placeholder name='PreferencesSection'/>"
 "      <separator/>"
-#if !GTK_CHECK_VERSION(3,0,0)
-"      <menuitem action='Wallpaper'/>"
-#endif
 "      <separator/>"
 "    </menu>"
 "    <menu action='PluginsMenu'>"
@@ -2964,7 +2961,7 @@ static const gchar *menu_ui_description =
 "<accelerator action='ConnectZoomFitAlt1'/>"
 "</ui>";
 
-static gchar *menu_translate(const gchar *path, gpointer data)
+static gchar *menu_translate(const gchar *path, gpointer UNUSED(data))
 {
        return (gchar *)(_(path));
 }
@@ -3293,7 +3290,7 @@ void layout_actions_setup(LayoutWindow *lw)
 static gint layout_editors_reload_idle_id = -1;
 static GList *layout_editors_desktop_files = NULL;
 
-static gboolean layout_editors_reload_idle_cb(gpointer data)
+static gboolean layout_editors_reload_idle_cb(gpointer UNUSED(data))
 {
        if (!layout_editors_desktop_files)
                {
@@ -3412,7 +3409,7 @@ GtkWidget *layout_actions_menu_tool_bar(LayoutWindow *lw)
        DEBUG_NAME(menu_bar);
        toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
        DEBUG_NAME(toolbar);
-       lw->menu_tool_bar = gtk_vbox_new(FALSE, 0);
+       lw->menu_tool_bar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
        gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), menu_bar, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), toolbar, FALSE, FALSE, 0);
@@ -3923,7 +3920,7 @@ static gboolean layout_bar_enabled(LayoutWindow *lw)
        return lw->bar && gtk_widget_get_visible(lw->bar);
 }
 
-static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
+static void layout_bar_destroyed(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -4018,7 +4015,7 @@ static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
 }
 
 
-static void layout_bar_sort_destroyed(GtkWidget *widget, gpointer data)
+static void layout_bar_sort_destroyed(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
 
@@ -4147,7 +4144,7 @@ void layout_bars_new_selection(LayoutWindow *lw, gint count)
 GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image)
 {
        if (lw->utility_box) return lw->utility_box;
-       lw->utility_box = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+       lw->utility_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        lw->utility_paned = gtk_hpaned_new();
        DEBUG_NAME(lw->utility_paned);
        gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
@@ -4167,7 +4164,7 @@ void layout_bars_close(LayoutWindow *lw)
        layout_bar_close(lw);
 }
 
-static gboolean layout_exif_window_destroy(GtkWidget *widget, gpointer data)
+static gboolean layout_exif_window_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
        LayoutWindow *lw = data;
        lw->exif_window = NULL;