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

[Thorsten Behrens (via logerrit)]

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

New commits:
commit c34c9a6eab23bcc43cf7adce365e16abc6cec58a
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Mon Aug 12 11:26:04 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Aug 13 22:57:43 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í <xiscofauli at libreoffice.org>
    (cherry picked from commit 536ab2f3ba1e71badaaf98db9419ca7c7ddd7ac4)
    Reviewed-on: https://gerrit.libreoffice.org/77421

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