talons

commit 6288e1e46f458b8730c43f21a17221290a0216b2
parent 58163aafa67f68ee2df6e1e96e0d32b0effb5aaa
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Wed, 25 Jul 2012 18:51:45 +0000

2012-07-25 [ticho]	3.8.1cvs17

	* src/gtk/prefswindow.c
		Correctly set transient_for property for preferences window,
		as well as for color picker dialogs. Fixes bug #2710.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/prefswindow.c
 | 
5
+++++

4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-25 [ticho]	3.8.1cvs17
+
+	* src/gtk/prefswindow.c
+		Correctly set transient_for property for preferences window,
+		as well as for color picker dialogs. Fixes bug #2710.
+
 2012-07-25 [ticho]	3.8.1cvs16
 
 	* src/gtk/quicksearch.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4391,3 +4391,4 @@
 ( cvs diff -u -r 1.49.2.146 -r 1.49.2.147 src/procmime.c;  ) > 3.8.1cvs14.patchset
 ( cvs diff -u -r 1.49.2.147 -r 1.49.2.148 src/procmime.c;  ) > 3.8.1cvs15.patchset
 ( cvs diff -u -r 1.1.2.110 -r 1.1.2.111 src/gtk/quicksearch.c;  ) > 3.8.1cvs16.patchset
+( cvs diff -u -r 1.12.2.60 -r 1.12.2.61 src/gtk/prefswindow.c;  ) > 3.8.1cvs17.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -32,6 +32,7 @@
 #include "prefswindow.h"
 #include "gtkutils.h"
 #include "prefs_common.h"
+#include "gtk/manage_window.h"
 
 enum { 
 	PREFS_PAGE_TITLE,		/* page title */
@@ -460,6 +461,8 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 	gtk_window_set_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal (GTK_WINDOW (prefswindow->window), TRUE);
 	gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
+	gtk_window_set_transient_for (GTK_WINDOW(prefswindow->window),
+			GTK_WINDOW(mainwindow_get_mainwindow()->window));
 	gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
 
 	prefswindow->vbox = gtk_vbox_new(FALSE, 6);
@@ -603,6 +606,8 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 			GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
 	gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
 	gtk_adjustment_changed(adj);
+
+	manage_window_focus_in(prefswindow->window, NULL, NULL);
 }
 
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,