[svn] GpgOL - r297 - trunk/src

[svn author wk]

Author: wk
Date: 2009-02-26 11:06:18 +0100 (Thu, 26 Feb 2009)
New Revision: 297

Modified:
   trunk/src/ChangeLog
   trunk/src/ext-commands.cpp
Log:
No decrypt menu item for non GpgOL messages.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-02-26 09:47:01 UTC (rev 296)
+++ trunk/src/ChangeLog	2009-02-26 10:06:18 UTC (rev 297)
@@ -1,5 +1,8 @@
 2009-02-26  Werner Koch  <wk at g10code.com>
 
+	* ext-commands.cpp (InstallCommands): Disable decrypt button for
+	non GpgOl messages.
+
 	* engine.c (engine_encrypt_prepare): Add arg SENDER.
 	* engine-assuan.c (op_assuan_encrypt): Ditto.
 	* mimemaker.c (do_mime_sign): Free sender string.

Modified: trunk/src/ext-commands.cpp
===================================================================
--- trunk/src/ext-commands.cpp	2009-02-26 09:47:01 UTC (rev 296)
+++ trunk/src/ext-commands.cpp	2009-02-26 10:06:18 UTC (rev 297)
@@ -541,11 +541,10 @@
       ul_release (message, __func__, __LINE__);
       ul_release (mdb, __func__, __LINE__);
       
-      /* We always enable the verify button as it might be useful on
-         an already decrypted message. */
       add_menu (eecb, pnCommandIDBase,
         "@", NULL,
-        opt.disable_gpgol? "":_("GpgOL Decrypt/Verify"), &m_nCmdCryptoState,
+        (opt.disable_gpgol || not_a_gpgol_message)?
+                "" : _("GpgOL Decrypt/Verify"), &m_nCmdCryptoState,
         opt.enable_debug? "GpgOL Debug-0 (display crypto info)":"", 
                 &m_nCmdDebug0,
         (opt.enable_debug && !opt.disable_gpgol)?