talons

commit 683b60fee90315837d35d36705af9d887265927a
parent 8f2ee3071315156ad9985f7ae0fe365962926c19
Author: wwp <subscript@free.fr>
Date:   Wed, 25 Aug 2021 12:09:10 +0200

Merge branch 'gtk3' of ssh+git://git.claws-mail.org/home/git/claws into gtk3

Diffstat:
M
src/password.h
 | 
32
++++++++++++++++----------------
M
src/password_gtk.h
 | 
2
+-

2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/password.h b/src/password.h
@@ -27,27 +27,27 @@
 #include <glib.h>
 
 #ifndef PASSWORD_CRYPTO_OLD
-/* Returns a pointer to master passphrase, asking the user
+/* Returns a pointer to primary passphrase, asking the user
  * if necessary. Do not free the return value. */
-const gchar *master_passphrase();
+const gchar *primary_passphrase();
 
-/* Returns TRUE if there is a master passphrase set in preferences. */
-gboolean master_passphrase_is_set();
-/* Returns TRUE if input contains correct master passphrase, as set
+/* Returns TRUE if there is a primary passphrase set in preferences. */
+gboolean primary_passphrase_is_set();
+/* Returns TRUE if input contains correct primary passphrase, as set
  * in preferences. */
-gboolean master_passphrase_is_correct(const gchar *input);
-/* Returns TRUE if master passphrase is entered (unlocked). */
-gboolean master_passphrase_is_entered();
-/* Removes (locks) master passphrase, if it was entered previously
+gboolean primary_passphrase_is_correct(const gchar *input);
+/* Returns TRUE if primary passphrase is entered (unlocked). */
+gboolean primary_passphrase_is_entered();
+/* Removes (locks) primary passphrase, if it was entered previously
  * in current session. */
-void master_passphrase_forget();
+void primary_passphrase_forget();
 
-/* Changes master passphrase. Also triggers reencryption of all stored
- * passwords using the new master passphrase.
- * oldp - old master passphrase; if NULL, it will be retrieved using
- *        master_passphrase()
- * newp - new master passphrase */
-void master_passphrase_change(const gchar *oldp, const gchar *newp);
+/* Changes primary passphrase. Also triggers reencryption of all stored
+ * passwords using the new primary passphrase.
+ * oldp - old primary passphrase; if NULL, it will be retrieved using
+ *        primary_passphrase()
+ * newp - new primary passphrase */
+void primary_passphrase_change(const gchar *oldp, const gchar *newp);
 #endif
 
 /* Wrapper around the old, DES-CBC-broken implementation which
diff --git a/src/password_gtk.h b/src/password_gtk.h
@@ -25,7 +25,7 @@
 #endif
 
 #ifndef PASSWORD_CRYPTO_OLD
-void master_passphrase_change_dialog();
+void primary_passphrase_change_dialog();
 #endif
 
 #endif /* __PASSWORD_GTK_H */