From dd8e01ae9524d8109ce66b9294c64f50159d9672 Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Fri, 2 Mar 2018 08:28:52 +0100
Subject: Prompt for master password only is use_master_password is on

---
 libsylph/account.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libsylph/account.c b/libsylph/account.c
index 775e2f4..95d19fc 100644
--- a/libsylph/account.c
+++ b/libsylph/account.c
@@ -36,6 +36,7 @@
 #include "procheader.h"
 #include "utils.h"
 #include "sylmain.h"
+#include "prefs_common.h"
 
 PrefsAccount *cur_account;
 
@@ -53,7 +54,11 @@ void account_read_config_all(void)
 	PrefsAccount *ac_prefs;
 #if USE_SSL
 	gchar *master_password;
-	master_password = input_query_password("Sylpheed", "Master password");
+	if (prefs_common.use_master_password) {
+		master_password = input_query_password("Sylpheed", "Master password");
+	} else {
+		master_password = NULL;
+	}
 #endif
 
 	debug_print(_("Reading all config for each account...\n"));
-- 
cgit v1.3