From: Andrej Kacian <ticho@claws-mail.org>
Date: Fri, 25 Mar 2016 11:15:23 +0000 (+0100)
Subject: Fix incorporation dialog focus with master passphrase dialog.
X-Git-Tag: 3.14.0~135^2~1
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6422829a0dc334a48c3a370f3bd274a72ef3d310;ds=sidebyside

Fix incorporation dialog focus with master passphrase dialog.
---

diff --git a/src/inc.c b/src/inc.c
index 5e994086c..6344d22bb 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -570,6 +570,11 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 		pop3_session = POP3_SESSION(session->session); 
 		pop3_session->user = g_strdup(pop3_session->ac_prefs->userid);
 
+		if (inc_dialog->show_dialog)
+			manage_window_focus_in
+				(inc_dialog->dialog->window,
+				 NULL, NULL);
+
 		if (password_get(pop3_session->user,
 					pop3_session->ac_prefs->recv_server,
 					"pop3", pop3_get_port(pop3_session),
@@ -579,26 +584,21 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 						pop3_session->ac_prefs->account_id, PWS_ACCOUNT_RECV)) == NULL) {
 			gchar *pass;
 
-			if (inc_dialog->show_dialog)
-				manage_window_focus_in
-					(inc_dialog->dialog->window,
-					 NULL, NULL);
-
 			pass = input_dialog_query_password_keep
 				(pop3_session->ac_prefs->recv_server,
 				 pop3_session->user,
 				 &(pop3_session->ac_prefs->session_passwd));
 
-			if (inc_dialog->show_dialog)
-				manage_window_focus_out
-					(inc_dialog->dialog->window,
-					 NULL, NULL);
-
 			if (pass) {
 				pop3_session->pass = pass;
 			}
 		}
 
+		if (inc_dialog->show_dialog)
+			manage_window_focus_out
+				(inc_dialog->dialog->window,
+				 NULL, NULL);
+
 		qlist = next;
 	}