From 536ab2f3ba1e71badaaf98db9419ca7c7ddd7ac4 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Mon, 12 Aug 2019 11:26:04 +0200 Subject: tdf#116085 add more Gpg4Win binary locations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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í --- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 9ff40b864144..032171928c88 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 -- cgit