[Winpt-commits] r223 - in trunk: . Src

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2006-06-02 10:00:43 +0200 (Fri, 02 Jun 2006)
New Revision: 223

Modified:
   trunk/NEWS
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/wptKeygenDlg.cpp
   trunk/configure.ac
Log:
Added missing patch; prepare new release.



Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-06-01 08:30:46 UTC (rev 222)
+++ trunk/NEWS	2006-06-02 08:00:43 UTC (rev 223)
@@ -831,3 +831,6 @@
 * Adjust verify code to print a stronger warning in case that
   the issuer key is not certified by a trusted sig.
 * Fix problem on first-start when the default keyserver will be set.
+
+(0.12.3)
+* Fix sigv due to missing patch.

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-06-01 08:30:46 UTC (rev 222)
+++ trunk/Src/ChangeLog	2006-06-02 08:00:43 UTC (rev 223)
@@ -1,3 +1,7 @@
+2006-06-02  Timo Schulz  <ts at g10code.de>
+
+	* wptKeygenDlg.cpp (keygen_dlg_proc): Forgot to apply patch.
+	
 2006-06-01  Timo Schulz  <ts at g10code.de>
 
 	* wptKeyserver.cpp (check_URL): change semantic.

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2006-06-01 08:30:46 UTC (rev 222)
+++ trunk/Src/WinPT-en.rc	2006-06-02 08:00:43 UTC (rev 223)
@@ -1958,14 +1958,14 @@
             VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
-            VALUE "FileVersion", "0.12.2\0"
+            VALUE "FileVersion", "0.12.3\0"
             VALUE "InternalName", "WinPT\0"
             VALUE "LegalCopyright", " Copyright (C) 2006 Timo Schulz\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinPT.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Windows Privacy Tray\0"
-            VALUE "ProductVersion", "0.12.2\0"
+            VALUE "ProductVersion", "0.12.3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp	2006-06-01 08:30:46 UTC (rev 222)
+++ trunk/Src/wptKeygenDlg.cpp	2006-06-02 08:00:43 UTC (rev 223)
@@ -464,10 +464,10 @@
                 return FALSE;
             }
 
-            if (!use_comment && !strlen (utf8_comment))
+            if (!use_comment && !utf8_comment)
                 p = gpg_genkey_params (keytype, bits, utf8_name, NULL, 
 				       email, expire, pwd);
-            else
+	    else
                 p = gpg_genkey_params (keytype, bits, utf8_name, utf8_comment, 
 				       email, expire, pwd);
 	    free_if_alloc (utf8_name);

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-06-01 08:30:46 UTC (rev 222)
+++ trunk/configure.ac	2006-06-02 08:00:43 UTC (rev 223)
@@ -15,7 +15,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.12.2, http://www.winpt.org)
+AC_INIT(WinPT, 0.12.3, http://www.winpt.org)
 NEED_GPG_VERSION=1.4.2
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.1