0.9.6claws72

[claws.git] / src / sgpgme.c

diff --git a/src/sgpgme.c b/src/sgpgme.c
index 391f0883bcd4481afba5b85dc8f1752e62facb83..7fb63768fef3d89ce26443c946ba3c49e52490f1 100644 (file)
--- a/src/sgpgme.c
+++ b/src/sgpgme.c
@@ -100,23 +100,20 @@ static const gchar *get_validity_str(unsigned long validity)
 
 gchar *sgpgme_sigstat_info_short(GpgmeCtx ctx, GpgmeSigStat status)
 {
-       GpgmeKey key;
-
        switch (status) {
        case GPGME_SIG_STAT_GOOD:
        {
-               unsigned long validity = 0, val, i;     
+               GpgmeKey key;
+               unsigned long validity = 0;
        
-               if (gpgme_get_sig_key(ctx, 0, &key) != GPGME_No_Error)
-                       return g_strdup(_("Error"));
-               
-               i = 0;
-               while ((val = gpgme_key_get_ulong_attr(key, GPGME_ATTR_VALIDITY, NULL, i++)) > 0)
-                       if (val > validity)
-                               validity = val;
+               if (gpgme_get_sig_key(ctx, 0, &key) != GPGME_No_Error)
+                       return g_strdup(_("Error"));
+
+               validity = gpgme_get_sig_ulong_attr(ctx, 0,
+                       GPGME_ATTR_VALIDITY, 0);
                
                return g_strdup_printf(_("Valid signature by %s (Trust: %s)"),
-                       gpgme_key_get_string_attr(key, GPGME_ATTR_USERID, NULL, 0),
+                       gpgme_key_get_string_attr(key, GPGME_ATTR_NAME, NULL, 0),
                        get_validity_str(validity));
        }
        case GPGME_SIG_STAT_GOOD_EXP:
@@ -139,6 +136,11 @@ gchar *sgpgme_sigstat_info_short(GpgmeCtx ctx, GpgmeSigStat status)
        return g_strdup(_("Error"));
 }
 
+gchar *sgpgme_sigstat_info_full(GpgmeCtx ctx, GpgmeSigStat status)
+{
+       return g_strdup(_("Todo"));
+}
+
 void sgpgme_init()
 {
        if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) !=