diff options
| author | Werner Koch <wk@gnupg.org> | 2019-09-27 15:44:23 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-09-27 15:44:23 +0200 |
| commit | 9698761933f7ade732178b45df2a8763e5801763 (patch) | |
| tree | 5454a013e219a64dfd0feaf701285a65b7cfa431 /g10/photoid.c | |
| parent | build: Build gpg-pair-tool only when there is newer libgcrypt. (diff) | |
| parent | kbx: Fix error code return in keyboxd. (diff) | |
| download | gnupg2-9698761933f7ade732178b45df2a8763e5801763.tar.xz gnupg2-9698761933f7ade732178b45df2a8763e5801763.zip | |
Merge branch 'switch-to-gpgk' into master
--
Resolved Conflicts:
* common/asshelp.c: Keep the new code in master for spawing under
Windows.
* g10/Makefile.am: Keep all new file.
* g10/photoid.c: Pass CTRL to pct_expando.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/photoid.c')
| -rw-r--r-- | g10/photoid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/photoid.c b/g10/photoid.c index 477b641c6..f7ada2729 100644 --- a/g10/photoid.c +++ b/g10/photoid.c @@ -667,8 +667,8 @@ show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count, int offset = attrs[i].len-len; /* make command grow */ - command = pct_expando (opt.photo_viewer, &args); - if (!command) + command = pct_expando (ctrl, opt.photo_viewer,&args); + if(!command) goto fail; name = xmalloc (1 + 16 + strlen(EXTSEP_S) |