Mercurial > ~mikael > mcabber > hg
comparison mcabber/src/main.c @ 1238:80008fe2a4f2
Re-enable gpg-agent (revert 591d8b35c881)
Some people were actually using it... :)
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 16 Jun 2007 12:30:43 +0200 |
parents | 591d8b35c881 |
children | 3a4018f18bdf |
comparison
equal
deleted
inserted
replaced
1237:dcb99f0b5aaa | 1238:80008fe2a4f2 |
---|---|
245 void main_init_pgp(void) | 245 void main_init_pgp(void) |
246 { | 246 { |
247 #ifdef HAVE_GPGME | 247 #ifdef HAVE_GPGME |
248 const char *pk, *pp; | 248 const char *pk, *pp; |
249 char *typed_passwd = NULL; | 249 char *typed_passwd = NULL; |
250 char *p; | |
250 bool pgp_invalid = FALSE; | 251 bool pgp_invalid = FALSE; |
251 bool pgp_agent; | 252 bool pgp_agent; |
252 //char *p; | 253 |
253 | 254 p = getenv("GPG_AGENT_INFO"); |
254 //p = getenv("GPG_AGENT_INFO"); | 255 pgp_agent = (p && strchr(p, ':')); |
255 //pgp_agent = (p && strchr(p, ':')); | |
256 pgp_agent = FALSE; | |
257 | 256 |
258 pk = settings_opt_get("pgp_private_key"); | 257 pk = settings_opt_get("pgp_private_key"); |
259 pp = settings_opt_get("pgp_passphrase"); | 258 pp = settings_opt_get("pgp_passphrase"); |
260 if (!pk) { | 259 if (!pk) { |
261 scr_LogPrint(LPRINT_LOGNORM, "WARNING: unkown PGP private key"); | 260 scr_LogPrint(LPRINT_LOGNORM, "WARNING: unkown PGP private key"); |