diff options
| author | Maximilian Krambach <[email protected]> | 2018-05-09 14:55:50 +0000 |
|---|---|---|
| committer | Maximilian Krambach <[email protected]> | 2018-05-09 14:55:50 +0000 |
| commit | 5f5bf024a83625b8f8bac4779b1c2236637c23e0 (patch) | |
| tree | 28820efe4193c6fba8dbe795d5a042b035355967 /src/engine-gpgsm.c | |
| parent | js: more testing (diff) | |
| parent | json: Improve auto-base64 encoding to not split UTF-8 chars. (diff) | |
| download | gpgme-5f5bf024a83625b8f8bac4779b1c2236637c23e0.tar.gz gpgme-5f5bf024a83625b8f8bac4779b1c2236637c23e0.zip | |
Merge branch 'master' into javascript-binding
Diffstat (limited to 'src/engine-gpgsm.c')
| -rw-r--r-- | src/engine-gpgsm.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index da7e524f..7b221831 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -1013,8 +1013,17 @@ status_handler (void *opaque, int fd) *(rest++) = 0; r = _gpgme_parse_status (line + 2); + if (gpgsm->status.mon_cb && r != GPGME_STATUS_PROGRESS) + { + /* Note that we call the monitor even if we do + * not know the status code (r < 0). */ + err = gpgsm->status.mon_cb (gpgsm->status.mon_cb_value, + line + 2, rest); + } + else + err = 0; - if (r >= 0) + if (r >= 0 && !err) { if (gpgsm->status.fnc) { |