aboutsummaryrefslogtreecommitdiffstats
path: root/lang/cpp/src
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-03-20 10:13:14 +0000
committerWerner Koch <[email protected]>2018-03-20 10:13:14 +0000
commit44f9e80ea99733f373d75c3632273f763e6f5853 (patch)
treeb3a504019e761a7624908058a0987eab01bf4505 /lang/cpp/src
parentjson: Add framework for the gpgme-json tool (diff)
parentcore: Do not clobber R_KEY in gpgme_get_key on error. (diff)
downloadgpgme-44f9e80ea99733f373d75c3632273f763e6f5853.tar.gz
gpgme-44f9e80ea99733f373d75c3632273f763e6f5853.zip
Merge branch 'master' into json-tool
Diffstat (limited to 'lang/cpp/src')
-rw-r--r--lang/cpp/src/importresult.cpp5
-rw-r--r--lang/cpp/src/importresult.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
index 8c35f9cc..dbb31d05 100644
--- a/lang/cpp/src/importresult.cpp
+++ b/lang/cpp/src/importresult.cpp
@@ -154,6 +154,11 @@ int GpgME::ImportResult::notImported() const
return d ? d->res.not_imported : 0 ;
}
+int GpgME::ImportResult::numV3KeysSkipped() const
+{
+ return d ? d->res.skipped_v3_keys : 0 ;
+}
+
GpgME::Import GpgME::ImportResult::import(unsigned int idx) const
{
return Import(d, idx);
diff --git a/lang/cpp/src/importresult.h b/lang/cpp/src/importresult.h
index 2f0e7f20..05476796 100644
--- a/lang/cpp/src/importresult.h
+++ b/lang/cpp/src/importresult.h
@@ -78,6 +78,7 @@ public:
int numSecretKeysUnchanged() const;
int notImported() const;
+ int numV3KeysSkipped() const;
Import import(unsigned int idx) const;
std::vector<Import> imports() const;