[Gpg4win-commits] r1376 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2010-04-09 14:40:34 +0200 (Fri, 09 Apr 2010)
New Revision: 1376

Modified:
   trunk/ChangeLog
   trunk/src/inst-pinentry.nsi
Log:
2010-04-09  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-pinentry.nsi: Install pinentry-gtk-2 as default if qt
	is not available (should fix issue1315).


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-01 12:25:35 UTC (rev 1375)
+++ trunk/ChangeLog	2010-04-09 12:40:34 UTC (rev 1376)
@@ -1,3 +1,8 @@
+2010-04-09  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-pinentry.nsi: Install pinentry-gtk-2 as default if qt
+	is not available (should fix issue1315).
+
 2010-04-01  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* configure.ac: Change compendium-de date.

Modified: trunk/src/inst-pinentry.nsi
===================================================================
--- trunk/src/inst-pinentry.nsi	2010-04-01 12:25:35 UTC (rev 1375)
+++ trunk/src/inst-pinentry.nsi	2010-04-09 12:40:34 UTC (rev 1376)
@@ -36,9 +36,21 @@
 
   File "${prefix}/bin/pinentry-w32.exe"
   File "${prefix}/bin/pinentry-gtk-2.exe"
+!ifndef GPG4WIN_LIGHT
   File "${prefix}/bin/pinentry-qt4.exe"
+
+  # If Qt is installed (usually by selecting kleopatra), we want
+  # the Qt pinentry as well.  Otherwise punt to gtk pinentry,
+  # which is always available.
+  !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"
+  Goto inst_pinentry_done
+  inst_pinentry_skip_qt:
+!endif
+  File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
+  inst_pinentry_done:
 
 !endif
 SectionEnd
-