From b5f01898d6d06464f75cfeac9f6061d3cdbdd026 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Sun, 12 Aug 2007 19:50:50 +0000 Subject: [PATCH] 2007-08-12 [wwp] 2.10.0cvs116 * src/plugins/pgpcore/prefs_gpg.c Don't try to unset a GPG_AGENT_INFO that was not set (and don't use a NULL string in Windows, it was crashing with --debug if GPG_AGENT_INFO was not set). --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpcore/prefs_gpg.c | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d6598e69a..f429297ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-12 [wwp] 2.10.0cvs116 + + * src/plugins/pgpcore/prefs_gpg.c + Don't try to unset a GPG_AGENT_INFO that was not + set (and don't use a NULL string in Windows, it was + crashing with --debug if GPG_AGENT_INFO was not set). + 2007-08-12 [wwp] 2.10.0cvs115 * src/privacy.h diff --git a/PATCHSETS b/PATCHSETS index cb266d3cd..2856bdf2c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2770,3 +2770,4 @@ ( cvs diff -u -r 1.52.2.47 -r 1.52.2.48 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/combobox.c; ) > 2.10.0cvs114.patchset ( cvs diff -u -r 1.52.2.47 -r 1.52.2.48 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/combobox.c; ) > 2.10.0cvs114.patchset ( cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/privacy.h; ) > 2.10.0cvs115.patchset +( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpcore/prefs_gpg.c; ) > 2.10.0cvs116.patchset diff --git a/configure.ac b/configure.ac index a1f812301..7df2c7a35 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=115 +EXTRA_VERSION=116 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c index 7b34bc3a3..ffdb10629 100644 --- a/src/plugins/pgpcore/prefs_gpg.c +++ b/src/plugins/pgpcore/prefs_gpg.c @@ -530,9 +530,13 @@ void prefs_gpg_enable_agent(gboolean enable) debug_print("Can't enable gpg agent (no GPG_AGENT_INFO)\n"); } } else { + if (saved_gpg_agent_info) { g_unsetenv("GPG_AGENT_INFO"); debug_print("unset GPG_AGENT_INFO=%s\n", saved_gpg_agent_info); + } else { + debug_print("Can't disable gpg agent (no GPG_AGENT_INFO)\n"); + } } } -- 2.25.1