[git] GPGME - branch, master, updated. gpgme-1.6.0-228-g537cb87

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  537cb871fd59f3a20c697a046715e6339ff6633b (commit)
      from  1bff47ee58bcf9d0016fb7ac7e37cbf075abd059 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 537cb871fd59f3a20c697a046715e6339ff6633b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 13 11:56:18 2016 +0200

    Cpp: Add feature enum for new identify
    
    * lang/cpp/src/context.cpp (supported_features2): Add
    BinaryAndFineGrainedIdentify
    * lang/cpp/src/global.h (Feature2): ditto.
    
    --
    This is mostly for compatible code with KF5::Gpgmepp where there
    is no hard requirement against gpgme 1.7. With 1.7 a version
    check would also suffice.

diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 9e31b6a..20d827e 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -1519,6 +1519,7 @@ static const unsigned long supported_features = 0
         ;
 
 static const unsigned long supported_features2 = 0
+        | GpgME::BinaryAndFineGrainedIdentify
         ;
 
 bool GpgME::hasFeature(unsigned long features)
diff --git a/lang/cpp/src/global.h b/lang/cpp/src/global.h
index 9be5202..508e1d7 100644
--- a/lang/cpp/src/global.h
+++ b/lang/cpp/src/global.h
@@ -131,8 +131,10 @@ enum Feature {
     FeatureMaxValue                            = 0x80000000
 };
 enum Feature2 {
+    BinaryAndFineGrainedIdentify               = 0x00000001, // gpgme >= 1.7.0
     Feature2MaxValue                           = 0x80000000
 };
+
 // use hasFeature( unsigned long, unsigned long ) instead
 GPGMEPP_DEPRECATED_EXPORT bool hasFeature(unsigned long feature);
 GPGMEPP_EXPORT bool hasFeature(unsigned long feature, unsigned long feature2);

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

Summary of changes:
 lang/cpp/src/context.cpp | 1 +
 lang/cpp/src/global.h    | 2 ++
 2 files changed, 3 insertions(+)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org