[Winpt-commits] r233 - trunk/Src

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2006-06-20 17:27:45 +0200 (Tue, 20 Jun 2006)
New Revision: 233

Modified:
   trunk/Src/ChangeLog
   trunk/Src/wptPassphraseDlg.cpp
Log:
Apply patch.



Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2006-06-20 09:29:59 UTC (rev 232)
+++ trunk/Src/ChangeLog	2006-06-20 15:27:45 UTC (rev 233)
@@ -5,6 +5,8 @@
 	* wptKeyserver.cpp (check_hkp_response): Invert error logic.
 	* wptKeyserverDlg.cpp (keyserver_recv_key): Corrected error
 	handling.
+	* wptPassphraseDlg.cpp (request_key_passphrase): Return
+	utf8 encoded passphrase.
 	
 2006-06-18  Timo Schulz  <ts at g10code.de>
 

Modified: trunk/Src/wptPassphraseDlg.cpp
===================================================================
--- trunk/Src/wptPassphraseDlg.cpp	2006-06-20 09:29:59 UTC (rev 232)
+++ trunk/Src/wptPassphraseDlg.cpp	2006-06-20 15:27:45 UTC (rev 233)
@@ -196,7 +196,7 @@
 	*ret_cancel = 1;
 	return NULL;
     }
-    p = m_strdup (pass.pwd);
+    p = native_to_utf8 (pass.pwd);
     wipememory (pass.pwd, sizeof (pass.pwd));
     return p;
 }