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).

diff --git a/ChangeLog b/ChangeLog
index d6598e69a330bc2d978230b49841eae2c901a56e..f429297ee78ef8db36becc2c6ea68e18d4807f6f 100644 (file)
--- 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 cb266d3cd6bc6f2f55af53425e2243646649de48..2856bdf2c50da392782d7c2f03438520ca776dce 100644 (file)
--- 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 a1f8123010759f65940b044f392b1d54b343021c..7df2c7a35ce12c3be5feaa9f0d371bda93559fc2 100644 (file)
--- 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 7b34bc3a3af1b850c82978268d545a6a860e1ab0..ffdb1062918558147035f3d296450488f84f47f8 100644 (file)
--- 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");
+               }
        }
 }