[Commits] [SCM] claws branch, master, updated. 3.11.1-205-g52551ae

[ticho at claws-mail.org]

The branch, master has been updated
       via  52551ae80da337c0d266374b154b118d535befd7 (commit)
      from  005c378d7bfd868de3f64063b4fe13d144d235aa (commit)

Summary of changes:
 src/prefs_summaries.c |    2 +-
 src/prefs_toolbar.c   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 52551ae80da337c0d266374b154b118d535befd7
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Jul 10 11:15:11 2015 +0200

    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 4951101..69d7a8f 100644
--- 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 63cad57..a990ee5 100644
--- 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;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail