summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2019-08-12 11:26:04 +0200
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2019-08-13 22:57:43 +0200
commitc34c9a6eab23bcc43cf7adce365e16abc6cec58a (patch)
tree6d85b43a4b4856060a646c5bc57cdc233a667418
parentd618641195b9e0cf3f6fa1b4e6c1ffa1616b814e (diff)
tdf#116085 add more Gpg4Win binary locations
Seems Gpg4Win recently grew a few more variants where to put stuff. Look there, too. Change-Id: Ifa09db11665671f518a6a66480c1a71fd619d8cd Reviewed-on: https://gerrit.libreoffice.org/77341 Tested-by: Jenkins Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org> (cherry picked from commit 536ab2f3ba1e71badaaf98db9419ca7c7ddd7ac4) Reviewed-on: https://gerrit.libreoffice.org/77421
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index d7ea836e2e71..584266f9c7a8 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -496,9 +496,14 @@ IMPL_STATIC_LINK(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, pButton, vo
// FIXME: call GpgME::dirInfo("bindir") somewhere in
// SecurityEnvironmentGpg or whatnot
// FIXME: perhaps poke GpgME for uiserver, and hope it returns something useful?
- const OUString aGUIServers[] = { OUString("Gpg4win\\kleopatra.exe"), OUString("GNU\\GnuPG\\kleopatra.exe"),
- OUString("GNU\\GnuPG\\launch-gpa.exe"), OUString("GNU\\GnuPG\\gpa.exe"),
- OUString("GNU\\GnuPG\\bin\\kleopatra.exe"), OUString("GNU\\GnuPG\\bin\\launch-gpa.exe"),
+ const OUString aGUIServers[] = { OUString("Gpg4win\\kleopatra.exe"),
+ OUString("Gpg4win\\bin\\kleopatra.exe"),
+ OUString("GNU\\GnuPG\\kleopatra.exe"),
+ OUString("GNU\\GnuPG\\launch-gpa.exe"),
+ OUString("GNU\\GnuPG\\gpa.exe"),
+ OUString("GnuPG\\bin\\gpa.exe"),
+ OUString("GNU\\GnuPG\\bin\\kleopatra.exe"),
+ OUString("GNU\\GnuPG\\bin\\launch-gpa.exe"),
OUString("GNU\\GnuPG\\bin\\gpa.exe") };
const char* const cPath = "C:\\Program Files (x86)";
#else