1 files changed, 14 insertions, 1 deletions

diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c
index 41fdb24..119a056 100644
--- a/src/prefs_common_dialog.c
+++ b/src/prefs_common_dialog.c
@@ -219,6 +219,7 @@ static struct Privacy {
 #if USE_SSL
 static struct MasterPassword {
         GtkWidget *checkbtn_use_master_password;
+        GtkWidget *checkbtn_auto_unload_master_password;
         GtkWidget *spinbtn_encrypted_password_min_length;
 } master_password;
 #endif
@@ -573,6 +574,9 @@ static PrefsUIData ui_data[] = {
 #if USE_SSL
         {"use_master_password", &master_password.checkbtn_use_master_password,
          prefs_set_data_from_toggle, prefs_set_toggle},
+        {"auto_unload_master_password",
+         &master_password.checkbtn_auto_unload_master_password,
+         prefs_set_data_from_toggle, prefs_set_toggle},
         {"encrypted_password_min_length",
          &master_password.spinbtn_encrypted_password_min_length,
          prefs_set_data_from_spinbtn,
@@ -2681,6 +2685,7 @@ static void prefs_master_password_create(void)
         GtkWidget *hbox_spc;
         GtkWidget *label;
         GtkWidget *checkbtn_use_master_password;
+        GtkWidget *checkbtn_auto_unload_master_password;
         GtkWidget *spinbtn_encrypted_password_min_length;
         GtkObject *spinbtn_encrypted_password_min_length_adj;
 
@@ -2706,6 +2711,11 @@ static void prefs_master_password_create(void)
                                                 FALSE,
                                                 0);
 
+        PACK_CHECK_BUTTON (vbox_master_password_suboptions,
+                                           checkbtn_auto_unload_master_password,
+                                           _("Automatically unload master password "
+                                                 "after session initialization"));
+
         hbox1 = gtk_hbox_new (FALSE, 8);
         gtk_widget_show (hbox1);
         gtk_box_pack_start (GTK_BOX (vbox_master_password_suboptions),
@@ -2740,10 +2750,13 @@ static void prefs_master_password_create(void)
                                                                  64,
                                                                  -1);
 
-        SET_TOGGLE_SENSITIVITY (checkbtn_use_master_password, hbox1);
+        SET_TOGGLE_SENSITIVITY (checkbtn_use_master_password,
+                                                        vbox_master_password_suboptions);
 
         master_password.checkbtn_use_master_password
                 = checkbtn_use_master_password;
+        master_password.checkbtn_auto_unload_master_password
+                = checkbtn_auto_unload_master_password;
         master_password.spinbtn_encrypted_password_min_length
                 = spinbtn_encrypted_password_min_length;
 }