From 61a171290595fd6033851c1b30239057ffd54c37 Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Date: Mon, 10 Jul 2017 10:38:26 +0200
Subject: tdf#109046 Show correct signature type for OpenPGP

gpg4libre

Change-Id: I9c05f68e16928d14a29058f5bb9aa35c90b8f48b
Reviewed-on: https://gerrit.libreoffice.org/39744
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit efb24fc7bab19840d4959d22706719981dc8bac0)
Reviewed-on: https://gerrit.libreoffice.org/39911
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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";
-- 
cgit v1.2.3