xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
New commits: commit 4bff74f20a2007860b87e43443bb2f59ff4a3b3a Author: Thorsten Behrens <[email protected]> AuthorDate: Mon Aug 12 11:26:04 2019 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Aug 13 20:55:02 2019 +0200 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í <[email protected]> (cherry picked from commit 536ab2f3ba1e71badaaf98db9419ca7c7ddd7ac4) Reviewed-on: https://gerrit.libreoffice.org/77420 Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 03dcaca782e9..93f988649490 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -448,9 +448,14 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void) // 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 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
