#include <glib/gi18n.h>
#include <stdio.h>
#include <errno.h>
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
#include "sgpgme.h"
#include "privacy.h"
debug_print("err code %d\n", gpg_err_code(sig->status));
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
- if ((validity != GPGME_VALIDITY_MARGINAL) &&
- (validity != GPGME_VALIDITY_FULL) &&
- (validity != GPGME_VALIDITY_ULTIMATE))
- return SIGNATURE_WARN;
return SIGNATURE_OK;
case GPG_ERR_SIG_EXPIRED:
case GPG_ERR_KEY_EXPIRED:
uname = g_strdup("<?>");
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
- result = g_strdup_printf(_("Good signature from %s (Trust: %s)."),
- uname, get_validity_str(sig->validity));
+ result = g_strdup_printf(_("Good signature from %s."),
+ uname);
break;
case GPG_ERR_SIG_EXPIRED:
result = g_strdup_printf(_("Expired signature from %s."), uname);
case GPG_ERR_NO_ERROR:
case GPG_ERR_KEY_EXPIRED:
g_string_append_printf(siginfo,
- _("Good signature from \"%s\"\n"),
- uid);
+ _("Good signature from \"%s\" (Trust: %s)\n"),
+ uid, get_validity_str(sig->validity));
break;
case GPG_ERR_SIG_EXPIRED:
g_string_append_printf(siginfo,