Version 6.4.0.0.beta1, tag libreoffice-6.4.0.0.beta1
[LibreOffice.git] / external / gpgmepp / add-minimal-keyexport.patch
blobabaeb15897fcb3e115587d0ee4caf932aab05b81
1 --- lang/cpp/src/context.h.bak 2017-10-18 12:28:00.898945587 +0200
2 +++ lang/cpp/src/context.h 2017-10-18 12:28:35.794832395 +0200
3 @@ -178,10 +178,10 @@
4 // Key Export
5 //
7 - GpgME::Error exportPublicKeys(const char *pattern, Data &keyData);
8 - GpgME::Error exportPublicKeys(const char *pattern[], Data &keyData);
9 - GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData);
10 - GpgME::Error startPublicKeyExport(const char *pattern[], Data &keyData);
11 + GpgME::Error exportPublicKeys(const char *pattern, Data &keyData, bool minimal=false);
12 + GpgME::Error exportPublicKeys(const char *pattern[], Data &keyData, bool minimal=false);
13 + GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData, bool minimal=false);
14 + GpgME::Error startPublicKeyExport(const char *pattern[], Data &keyData, bool minimal=false);
17 // Key Import
18 --- lang/cpp/src/context.cpp.bak 2017-10-18 12:27:50.830978224 +0200
19 +++ lang/cpp/src/context.cpp 2017-10-18 12:30:13.278515603 +0200
20 @@ -557,14 +557,14 @@
24 -Error Context::exportPublicKeys(const char *pattern, Data &keyData)
25 +Error Context::exportPublicKeys(const char *pattern, Data &keyData, bool minimal)
27 d->lastop = Private::Export;
28 Data::Private *const dp = keyData.impl();
29 - return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, 0, dp ? dp->data : 0));
30 + return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
33 -Error Context::exportPublicKeys(const char *patterns[], Data &keyData)
34 +Error Context::exportPublicKeys(const char *patterns[], Data &keyData, bool minimal)
36 d->lastop = Private::Export;
37 #ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN
38 @@ -574,17 +574,17 @@
40 #endif
41 Data::Private *const dp = keyData.impl();
42 - return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, 0, dp ? dp->data : 0));
43 + return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
46 -Error Context::startPublicKeyExport(const char *pattern, Data &keyData)
47 +Error Context::startPublicKeyExport(const char *pattern, Data &keyData, bool minimal)
49 d->lastop = Private::Export;
50 Data::Private *const dp = keyData.impl();
51 - return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, 0, dp ? dp->data : 0));
52 + return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
55 -Error Context::startPublicKeyExport(const char *patterns[], Data &keyData)
56 +Error Context::startPublicKeyExport(const char *patterns[], Data &keyData, bool minimal)
58 d->lastop = Private::Export;
59 #ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN
60 @@ -594,7 +594,7 @@
62 #endif
63 Data::Private *const dp = keyData.impl();
64 - return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, 0, dp ? dp->data : 0));
65 + return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0));
68 ImportResult Context::importKeys(const Data &data)