talons

commit 52a925dba92be9164399e9c50bdd989af776f344
parent 84b0499d382889548433877ddd5d833891bd41c3
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Fri, 27 Jul 2012 18:50:03 +0000

2012-07-27 [ticho]	3.8.1cvs22

	* src/summaryview.c
	* src/textview.c
		Fixed setting "transient for" property for summaryview file
		dialog and messageview's image save dialog.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/summaryview.c
 | 
4
++++
M
src/textview.c
 | 
11
+++++++++++

5 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-27 [ticho]	3.8.1cvs22
+
+	* src/summaryview.c
+	* src/textview.c
+		Fixed setting "transient for" property for summaryview file
+		dialog and messageview's image save dialog.
+
 2012-07-27 [ticho]	3.8.1cvs21
 
 	* src/crash.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4396,3 +4396,4 @@
 ( cvs diff -u -r 1.1.2.60 -r 1.1.2.61 manual/advanced.xml;  ) > 3.8.1cvs19.patchset
 ( cvs diff -u -r 1.382.2.604 -r 1.382.2.605 src/compose.c;  ) > 3.8.1cvs20.patchset
 ( cvs diff -u -r 1.23.2.38 -r 1.23.2.39 src/crash.c;  cvs diff -u -r 1.83.2.191 -r 1.83.2.192 src/mimeview.c;  ) > 3.8.1cvs21.patchset
+( cvs diff -u -r 1.395.2.447 -r 1.395.2.448 src/summaryview.c;  cvs diff -u -r 1.96.2.243 -r 1.96.2.244 src/textview.c;  ) > 3.8.1cvs22.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=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -79,6 +79,7 @@
 #include "log.h"
 #include "edittags.h"
 #include "manual.h"
+#include "manage_window.h"
 
 #define SUMMARY_COL_MARK_WIDTH		10
 #define SUMMARY_COL_STATUS_WIDTH	13
@@ -4713,6 +4714,9 @@ void summary_save_as(SummaryView *summaryview)
 		Xstrdup_a(filename, msginfo->subject, return);
 		subst_for_filename(filename);
 	}
+
+	manage_window_focus_in(summaryview->window, NULL, NULL);
+
 	if (filename && !g_utf8_validate(filename, -1, NULL)) {
 		gchar *oldstr = filename;
 		filename = conv_codeset_strdup(filename,
diff --git a/src/textview.c b/src/textview.c
@@ -74,6 +74,7 @@
 #include "inputdialog.h"
 #include "timing.h"
 #include "tags.h"
+#include "manage_window.h"
 
 static GdkColor quote_colors[3] = {
 	{(gulong)0, (gushort)0, (gushort)0, (gushort)0},
@@ -3060,6 +3061,8 @@ static void save_file_cb (GtkAction *action, TextView *textview)
 	gchar *filepath = NULL;
 	gchar *filedir = NULL;
 	gchar *tmp_filename = NULL;
+	GtkWidget *window;
+
 	if (uri == NULL)
 		return;
 
@@ -3084,6 +3087,14 @@ static void save_file_cb (GtkAction *action, TextView *textview)
 
 	g_free(filename);
 
+	/* Pick correct window to set the file dialog "transient for" */
+	if (textview->messageview->window != NULL)
+		window = textview->messageview->window;
+	else
+		window = textview->messageview->mainwin->window;
+
+	manage_window_focus_in(window, NULL, NULL);
+
 	filename = filesel_select_file_save(_("Save as"), filepath);
 	if (!filename) {
 		g_free(filepath);