[Gpg4win-commits] r1447 - in branches/gpg4win-2.0.2-branch: . src

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-05-27 14:13:52 +0200 (Thu, 27 May 2010)
New Revision: 1447

Modified:
   branches/gpg4win-2.0.2-branch/ChangeLog
   branches/gpg4win-2.0.2-branch/src/inst-pinentry.nsi
Log:
Set pinentry-gtk as default.


Modified: branches/gpg4win-2.0.2-branch/ChangeLog
===================================================================
--- branches/gpg4win-2.0.2-branch/ChangeLog	2010-05-27 11:04:12 UTC (rev 1446)
+++ branches/gpg4win-2.0.2-branch/ChangeLog	2010-05-27 12:13:52 UTC (rev 1447)
@@ -3,6 +3,8 @@
 	* doc: Remove doc dir.
 
 	* doc: Add doc dir from trunk.
+	
+  	* src/inst-pinentry.nsi: Set pinentry-gtk as default.
 
 2010-04-16  Werner Koch  <wk at g10code.com>
 

Modified: branches/gpg4win-2.0.2-branch/src/inst-pinentry.nsi
===================================================================
--- branches/gpg4win-2.0.2-branch/src/inst-pinentry.nsi	2010-05-27 11:04:12 UTC (rev 1446)
+++ branches/gpg4win-2.0.2-branch/src/inst-pinentry.nsi	2010-05-27 12:13:52 UTC (rev 1447)
@@ -45,7 +45,7 @@
   !insertmacro SectionFlagIsSet ${SEC_qt} \
                 ${SF_SELECTED} inst_pinentry_have_qt inst_pinentry_skip_qt
   inst_pinentry_have_qt:
-  File /oname=pinentry.exe "${prefix}/bin/pinentry-qt4.exe"
+  File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
   Goto inst_pinentry_done
   inst_pinentry_skip_qt:
 !endif