[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/utils
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-04-28 10:07:29
Message-ID: 1209377249.575965.800.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802007 by mutz:

Add ClearsignedMessage as a separate type

 M  +1 -1      classify.cpp  
 M  +8 -6      classify.h  


--- trunk/KDE/kdepim/kleopatra/utils/classify.cpp #802006:802007
@@ -101,7 +101,7 @@
         char content[28];
         unsigned int classification;
     } content_classifications[] = {
-        { "MESSAGE",           OpaqueSignature|CipherText },
+        { "MESSAGE",           OpaqueSignature|CipherText|ClearsignedMessage },
         { "PRIVATE KEY BLOCK", ExportedPSM },
         { "PUBLIC KEY BLOCK",  Certificate },
         { "SIGNATURE",         DetachedSignature },
--- trunk/KDE/kdepim/kleopatra/utils/classify.h #802006:802007
@@ -61,19 +61,20 @@
             // type:
             DetachedSignature  = 0x010,
             OpaqueSignature    = 0x020,
+            ClearsignedMessage = 0x040,
 
-            AnySignature       = DetachedSignature|OpaqueSignature,
+            AnySignature       = DetachedSignature|OpaqueSignature|ClearsignedMessage,
 
-            CipherText         = 0x040,
+            CipherText         = 0x080,
 
-            AnyMessageType     = DetachedSignature|OpaqueSignature|CipherText,
+            AnyMessageType     = AnySignature|CipherText,
 
-            Certificate        = 0x080,
-            ExportedPSM        = 0x100,
+            Certificate        = 0x100,
+            ExportedPSM        = 0x200,
 
             AnyCertStoreType   = Certificate|ExportedPSM,
 
-            CertificateRequest = 0x200,
+            CertificateRequest = 0x400,
 
             AnyType            = AnyMessageType|AnyCertStoreType|CertificateRequest,
             TypeMask           = AnyType
@@ -112,6 +113,7 @@
     make_convenience( DetachedSignature, TypeMask )
     make_convenience( OpaqueSignature,   TypeMask )
     make_convenience( CipherText,        TypeMask )
+    make_convenience( AnyMessageType,    TypeMask )
 #undef make_convenience
 
     inline GpgME::Protocol findProtocol( const unsigned int classifcation ) {
[prev in list] [next in list] [prev in thread] [next in thread]