[svn] GnuPG - r5479 - trunk/common

[svn author wk]

Author: wk
Date: 2010-11-08 10:18:47 +0100 (Mon, 08 Nov 2010)
New Revision: 5479

Modified:
   trunk/common/ChangeLog
   trunk/common/logging.c
Log:
A merged changes


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2010-10-29 19:54:56 UTC (rev 5478)
+++ trunk/common/ChangeLog	2010-11-08 09:18:47 UTC (rev 5479)
@@ -1,3 +1,8 @@
+2010-11-04  Werner Koch  <wk at g10code.com>
+
+	* logging.c (do_logv) [W32]: Don't set a default log stream if the
+	registry entry is empty.
+
 2010-10-27  Werner Koch  <wk at g10code.com>
 
 	* gettime.c (gnupg_get_isotime): Compare to (time_t)-1.

Modified: trunk/common/logging.c
===================================================================
--- trunk/common/logging.c	2010-10-29 19:54:56 UTC (rev 5478)
+++ trunk/common/logging.c	2010-11-08 09:18:47 UTC (rev 5479)
@@ -577,7 +577,7 @@
 
       tmp = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG",
                                             "DefaultLogFile");
-      log_set_file (tmp);
+      log_set_file (tmp && *tmp? tmp : NULL);
       jnlib_free (tmp);
 #else
       log_set_file (NULL); /* Make sure a log stream has been set.  */