xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5bccacf784dc26fb806d14a2acc2bec7e414c7bc
Author: Samuel Mehrbrodt <[email protected]>
Date:   Mon Jul 10 10:38:26 2017 +0200

    tdf#109046 Show correct signature type for OpenPGP
    
    gpg4libre
    
    Change-Id: I9c05f68e16928d14a29058f5bb9aa35c90b8f48b
    Reviewed-on: https://gerrit.libreoffice.org/39744
    Reviewed-by: Thorsten Behrens <[email protected]>
    Tested-by: Thorsten Behrens <[email protected]>
    (cherry picked from commit efb24fc7bab19840d4959d22706719981dc8bac0)
    Reviewed-on: https://gerrit.libreoffice.org/39786
    Tested-by: Jenkins <[email protected]>
    Reviewed-by: Miklos Vajna <[email protected]>

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 22154dc4b2a3..fd4a7f13f79d 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -571,8 +571,11 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
             // Decide type string.
             if (maSignatureManager.mxStore.is())
             {
+                // OpenPGP
+                if (!rInfo.ouGpgCertificate.isEmpty())
+                    aType = "OpenPGP";
                 // XML based: XAdES or not.
-                if (!rInfo.ouCertDigest.isEmpty())
+                else if (!rInfo.ouCertDigest.isEmpty())
                     aType = "XAdES";
                 else
                     aType = "XML-DSig";
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to