2012-07-10 [mones] 3.8.1cvs12

[claws.git] / src / plugins / pgpcore / sgpgme.c

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 59bdbe9e2790a8fa74510ad2bebe1ad023f9fc2b..52f6d36ba3cbb15d397d24961f6423331322b467 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 the Claws Mail team
+ * Copyright (C) 1999-2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
  
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
  
 #ifdef USE_GPGME
@@ -211,11 +212,11 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
        switch (gpg_err_code(sig->status)) {
        case GPG_ERR_NO_ERROR:
                switch (gpg_err_code(sig->validity)) {
-               case GPGME_VALIDITY_MARGINAL:
                case GPGME_VALIDITY_FULL:
                case GPGME_VALIDITY_ULTIMATE:
                        result = g_strdup_printf(_("Good signature from %s."), uname);
                        break;
+               case GPGME_VALIDITY_MARGINAL:
                case GPGME_VALIDITY_UNKNOWN:
                case GPGME_VALIDITY_UNDEFINED:
                case GPGME_VALIDITY_NEVER:
@@ -326,7 +327,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                                j++;
                                user = user->next;
                        }
-                       g_string_append_printf(siginfo,
+                       g_string_append(siginfo,
                                _("Primary key fingerprint:"));
                        const char* primary_fpr = NULL;
                        if (key && key->subkeys && key->subkeys->fpr)