[Commits] [SCM] claws branch, master, updated. 3.13.2-29-g3dfc764

[ticho at claws-mail.org]

The branch, master has been updated
       via  3dfc764e34a658e911674ad4a0a1ab1bab60e5d7 (commit)
      from  126c9d80cee8f0f7f4559115f26f9891bd966d67 (commit)

Summary of changes:
 src/prefs_other.c |    7 +++++++
 1 file changed, 7 insertions(+)


- Log -----------------------------------------------------------------
commit 3dfc764e34a658e911674ad4a0a1ab1bab60e5d7
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Feb 10 18:31:25 2016 +0100

    Fix a logic error in handling results of master password change dialog.

diff --git a/src/prefs_other.c b/src/prefs_other.c
index 09a4b6c..01a6f54 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -722,6 +722,13 @@ static void prefs_other_save(PrefsPage *_page)
 			GTK_TOGGLE_BUTTON(page->checkbtn_use_password))
 			&& !master_password_is_set()) {
 		master_password_change_dialog();
+
+		/* In case user cancelled the password change dialog, we need
+		 * to disable the "use master password" checkbox. */
+		if (!master_password_is_set()) {
+			gtk_toggle_button_set_active(
+				GTK_TOGGLE_BUTTON(page->checkbtn_use_password), FALSE);
+		}
 	}
 
 	prefs_common.use_master_password =

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


hooks/post-receive
-- 
Claws Mail