[Commits] [SCM] claws branch, master, updated. 3.13.2-89-g6422829

[ticho at claws-mail.org]

The branch, master has been updated
       via  6422829a0dc334a48c3a370f3bd274a72ef3d310 (commit)
      from  189829e2c20a91cc869b96316dce1f549730977f (commit)

Summary of changes:
 src/inc.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 6422829a0dc334a48c3a370f3bd274a72ef3d310
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Mar 25 12:15:23 2016 +0100

    Fix incorporation dialog focus with master passphrase dialog.

diff --git a/src/inc.c b/src/inc.c
index 5e99408..6344d22 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;
 	}
 

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


hooks/post-receive
-- 
Claws Mail