aboutsummaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-07-07 10:02:41 +0000
committerWerner Koch <[email protected]>2009-07-07 10:02:41 +0000
commitf6f5430e5014f90b685420447dffe89b220e2663 (patch)
tree0a8c28fc24f291bbc3a148f7240d1c49421f9077 /g10/options.h
parent* debugging.texi (Common Problems): Add a note about corrupted (diff)
downloadgnupg-f6f5430e5014f90b685420447dffe89b220e2663.tar.gz
gnupg-f6f5430e5014f90b685420447dffe89b220e2663.zip
Reworked passing of envars to Pinentry.
Diffstat (limited to 'g10/options.h')
-rw-r--r--g10/options.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/g10/options.h b/g10/options.h
index 40bd23029..a99ca22e8 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -24,6 +24,7 @@
#include <types.h>
#include "main.h"
#include "packet.h"
+#include "../common/session-env.h"
#ifndef EXTERN_UNLESS_MAIN_MODULE
/* Norcraft can't cope with common symbols */
@@ -85,13 +86,11 @@ struct
int max_cert_depth;
const char *homedir;
const char *agent_program;
- char *display; /* 5 options to be passed to the gpg-agent */
- char *ttyname;
- char *ttytype;
+
+ /* Options to be passed to the gpg-agent */
+ session_env_t session_env;
char *lc_ctype;
char *lc_messages;
- char *xauthority;
- char *pinentry_user_data;
int skip_verify;
int compress_keys;