aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Fella via Gnupg-devel <gnupg-devel@gnupg.org>2021-02-28 14:34:10 +0100
committerWerner Koch <wk@gnupg.org>2021-03-01 09:43:26 +0100
commitbe2da244565822ad1f268f84dc88a23e5aa8d26a (patch)
treeef33f2f35112039a1c9d0d5bc2fe97c9f3f07eab
parent5ed1567e7c6b08988a134effb3c1f42ef6d5319a (diff)
downloadgnupg-be2da244565822ad1f268f84dc88a23e5aa8d26a.tar.gz
gpg: Keep temp files when opening images via xdg-open
* g10/photoid.c (get_default_photo_command): Change parameter for xdg-open. -- xdg-open spawns the user's preferred image viewer and then exits. Therefore we must not remove the temp file when it exits, otherwise by the time the actual image viewer is started the file doesn't exist any more. Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
-rw-r--r--g10/photoid.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/photoid.c b/g10/photoid.c
index 592d5e484..2c95930fb 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -287,7 +287,11 @@ get_default_photo_command(void)
else if (!path_access ("display",X_OK))
return "display -title 'KeyID 0x%k' %i";
else if (getuid () && !path_access ("xdg-open", X_OK))
- return "xdg-open %i";
+ {
+ /* xdg-open spawns the actual program and exits so we need to
+ * keep the temp file */
+ return "xdg-open %I";
+ }
else
return "/bin/true";
#endif