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).
This commit is contained in:
Tristan Chabredier 2007-08-12 19:50:50 +00:00
parent e453b29c49
commit b5f01898d6
4 changed files with 13 additions and 1 deletions

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -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");
}
}
}