Fix two more issues with modal dialog focus on Windows.

Date format information dialog in /Display/Summaries.
Icon chooser dialog in /Toolbars/*.

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 495110166d38bace7f5e98683f6b2cb5da961ed9..69d7a8f366a2d4519a2d8e8c675926c413aba35e 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -297,10 +297,10 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                         label3);
 
        gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
 
        gtk_widget_show(datefmt_win);
        manage_window_set_transient(GTK_WINDOW(datefmt_win));
+       gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
 
        gtk_widget_grab_focus(ok_btn);
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 63cad57f026dcb2dd9616f404657cb72b1fd44ef..a990ee5038b466d7fd901db7dfe4397d99161943 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1752,6 +1752,7 @@ static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
 
        gtk_widget_show_all(icon_chooser_win);
        gtk_widget_grab_focus(GTK_WIDGET(icon_view));
+       manage_window_set_transient(GTK_WINDOW(icon_chooser_win));
        gtk_window_set_modal(GTK_WINDOW(icon_chooser_win), TRUE);
 
        prefs_toolbar->icon_chooser_win         = icon_chooser_win;