[Commits] [SCM] claws branch, master, updated. 3.13.2-27-g87ec96c

[ticho at claws-mail.org]

The branch, master has been updated
       via  87ec96c5974945425d1151da7f6f152ac963e070 (commit)
      from  8f2dc419f6d5e18138c037dcf9aa924310d3316f (commit)

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


- Log -----------------------------------------------------------------
commit 87ec96c5974945425d1151da7f6f152ac963e070
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Feb 9 16:29:31 2016 +0100

    Addendum to 503cb50 (Fix build with --with-password-encryption=old)

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 3e038e1..080d97f 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1857,7 +1857,9 @@ MainWindow *main_window_create()
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "NetworkLog", "Tools/NetworkLog", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator8", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "ForgetSessionPasswords", "Tools/ForgetSessionPasswords", GTK_UI_MANAGER_MENUITEM)
+#ifndef PASSWORD_CRYPTO_OLD
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "ForgetMasterPassword", "Tools/ForgetMasterPassword", GTK_UI_MANAGER_MENUITEM)
+#endif
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator9", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 
 /* Configuration menu */
@@ -3238,7 +3240,9 @@ do { \
 	FILL_TABLE("Menu/Tools/Execute", M_DELAY_EXEC);
 	FILL_TABLE("Menu/Tools/Expunge", M_DELETED_EXISTS);
 	FILL_TABLE("Menu/Tools/ForgetSessionPasswords", M_SESSION_PASSWORDS);
+#ifndef PASSWORD_CRYPTO_OLD
 	FILL_TABLE("Menu/Tools/ForgetMasterPassword", M_MASTER_PASSWORD);
+#endif
 	FILL_TABLE("Menu/Tools/DeleteDuplicates/SelFolder", M_MSG_EXIST, M_ALLOW_DELETE);
 
 	FILL_TABLE("Menu/Configuration", M_UNLOCKED);

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


hooks/post-receive
-- 
Claws Mail