diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-12 11:26:04 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-29 09:21:33 +0200 |
| commit | 7d4af74ff57ca67cc55a36173c492d474959507d (patch) | |
| tree | dcea1667bd603ac7eaa1eccbef6e6718d207e115 /xmlsecurity | |
| parent | ec4c2f7e12958f862c44d0cddadedda9786bdcad (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
Reviewed-on: https://gerrit.libreoffice.org/77913
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index fb39f0f55722..2280c77bbfb1 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -475,9 +475,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 |