2010-04-09 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 9 Apr 2010 12:40:34 +0000 (12:40 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 9 Apr 2010 12:40:34 +0000 (12:40 +0000)
* src/inst-pinentry.nsi: Install pinentry-gtk-2 as default if qt
is not available (should fix issue1315).

ChangeLog
src/inst-pinentry.nsi

index f01c1c0..6a7350c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Marcus Brinkmann  <marcus@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@intevation.de>
 
        * configure.ac: Change compendium-de date.
index ead33f4..3306901 100644 (file)
@@ -36,9 +36,21 @@ Section "-Pinentry" SEC_pinentry
 
   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
-