[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - xmlsecurity/source

[Libreoffice Gerrit user]

 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit caa828920719240bcf0fb4b55ffb0fd6a5dd8b82
Author:     Cor Nouws <oolst at nouenoff.nl>
AuthorDate: Thu Sep 27 21:53:12 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Oct 30 13:16:04 2018 +0100

    tdf#116085 make sure Certificate Manager is found with GPG4win v3
    
    Reviewed-on: https://gerrit.libreoffice.org/61061
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 89a60912bba7ffd6f65ea99f4664f343c5025c95)
    Reviewed-on: https://gerrit.libreoffice.org/61173
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    
    Change-Id: I3a7ab7ec046a6bbff4b4a020e76356ffd454bab8
    Reviewed-on: https://gerrit.libreoffice.org/62546
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 8c65aa2944fd..8a1ba46860a6 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -472,9 +472,11 @@ IMPL_STATIC_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, 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("kleopatra.exe"), OUString("launch-gpa.exe"), OUString("gpa.exe"),
-                                     OUString("bin\\kleopatra.exe"), OUString("bin\\launch-gpa.exe"), OUString("bin\\gpa.exe") };
-    const char* cPath = "C:\\Program Files (x86)\\GNU\\GnuPG";
+    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"),
+                                     OUString("GNU\\GnuPG\\bin\\gpa.exe") };
+    const char* const cPath = "C:\\Program Files (x86)";
 #else
     const OUString aGUIServers[] = { OUString("kleopatra"), OUString("seahorse"),  OUString("gpa"), OUString("kgpg") };
     const char* cPath = getenv("PATH");