[svn] GpgOL - r290 - trunk/src

[svn author wk]

Author: wk
Date: 2008-11-26 17:09:46 +0100 (Wed, 26 Nov 2008)
New Revision: 290

Modified:
   trunk/src/ChangeLog
   trunk/src/ext-commands.cpp
Log:
Status icon fix.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-11-26 15:19:42 UTC (rev 289)
+++ trunk/src/ChangeLog	2008-11-26 16:09:46 UTC (rev 290)
@@ -1,5 +1,8 @@
 2008-11-26  Werner Koch  <wk at g10code.com>
 
+	* ext-commands.cpp (InstallCommands): Don't show status icon for
+	non-gpgol messages.
+
 	* config-dialog.c (start_key_manager): Remove.
 	* ext-commands.cpp (DoCommand): Do not use start_key_manager as a
 	fallback.

Modified: trunk/src/ext-commands.cpp
===================================================================
--- trunk/src/ext-commands.cpp	2008-11-26 15:19:42 UTC (rev 289)
+++ trunk/src/ext-commands.cpp	2008-11-26 16:09:46 UTC (rev 290)
@@ -502,6 +502,8 @@
   if (m_lContext == EECONTEXT_READNOTEMESSAGE)
     {
       int is_encrypted = 0;
+      int not_a_gpgol_message = 0;
+      
       LPMDB mdb = NULL;
       LPMESSAGE message = NULL;
 
@@ -519,6 +521,11 @@
               if ( mapi_test_sig_status (message) )
                 is_encrypted++;
               break;
+            case MSGTYPE_GPGOL:
+            case MSGTYPE_SMIME:
+            case MSGTYPE_UNKNOWN:
+              not_a_gpgol_message = 1;
+              break;
             default:
               break;
             }
@@ -541,7 +548,7 @@
                 &m_nCmdDebug3,
         NULL);
 
-      if (!opt.disable_gpgol)
+      if (!opt.disable_gpgol && !not_a_gpgol_message)
         add_toolbar (pTBEArray, nTBECnt, 
                      is_encrypted == 2 
                      ? _("This is a signed and encrypted message.\n"