2006-11-13 [colin] 2.6.0cvs41

* src/plugins/pgpcore/sgpgme.c
		Maybe fix bug 1061, 'crash on opening
		signed email'
This commit is contained in:
Colin Leroy 2006-11-13 19:43:10 +00:00
parent c9e7ed73a2
commit 6ffe1de970
4 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2006-11-13 [colin] 2.6.0cvs41
* src/plugins/pgpcore/sgpgme.c
Maybe fix bug 1061, 'crash on opening
signed email'
2006-11-13 [wwp] 2.6.0cvs40
* src/plugins/pgpinline/pgpinline.c

View file

@ -2065,3 +2065,4 @@
( cvs diff -u -r 1.58.2.27 -r 1.58.2.28 po/de.po; ) > 2.6.0cvs38.patchset
( cvs diff -u -r 1.382.2.328 -r 1.382.2.329 src/compose.c; cvs diff -u -r 1.22.2.25 -r 1.22.2.26 src/quote_fmt_parse.y; ) > 2.6.0cvs39.patchset
( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpinline/pgpinline.c; ) > 2.6.0cvs40.patchset
( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/sgpgme.c; ) > 2.6.0cvs41.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=40
EXTRA_VERSION=41
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -187,6 +187,10 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
if (sig == NULL) {
return g_strdup(_("The signature has not been checked."));
}
if (sig->fpr == NULL) {
g_warning(_("PGP Core: Can't get key fingerprint."));
return g_strdup(_("PGP Core: Can't get key fingerprint."));
}
err = gpgme_get_key(ctx, sig->fpr, &key, 0);
if (gpg_err_code(err) == GPG_ERR_NO_AGENT) {