From: Colin Leroy Date: Wed, 17 Oct 2007 16:03:29 +0000 (+0000) Subject: 2007-10-17 [colin] 3.0.2cvs80 X-Git-Tag: rel_3_1_0~72 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=766acdaa9beb52a2fb6509563e57704c3c0aa17c 2007-10-17 [colin] 3.0.2cvs80 * src/plugins/pgpcore/select-keys.c Fix bug which prevented encryption key auto-selection when two or more matched the email address, but only one isn't revoked or expired. --- diff --git a/ChangeLog b/ChangeLog index 5180858ed..c3d09dcc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-10-17 [colin] 3.0.2cvs80 + + * src/plugins/pgpcore/select-keys.c + Fix bug which prevented encryption key + auto-selection when two or more matched the + email address, but only one isn't revoked + or expired. + 2007-10-17 [wwp] 3.0.2cvs79 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 9a0a3d153..dbef467e5 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2992,3 +2992,4 @@ ( cvs diff -u -r 1.5.2.50 -r 1.5.2.51 src/gtk/pluginwindow.c; ) > 3.0.2cvs77.patchset ( cvs diff -u -r 1.16.2.30 -r 1.16.2.31 src/prefs_customheader.c; cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/prefs_ext_prog.c; cvs diff -u -r 1.1.4.42 -r 1.1.4.43 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.63 -r 1.43.2.64 src/prefs_matcher.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_other.c; cvs diff -u -r 1.30.2.45 -r 1.30.2.46 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/combobox.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/combobox.h; cvs diff -u -r 1.5.2.69 -r 1.5.2.70 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.38 -r 1.4.2.39 src/gtk/gtkutils.h; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.23.2.42 -r 1.23.2.43 src/plugins/spamassassin/spamassassin_gtk.c; ) > 3.0.2cvs78.patchset ( cvs diff -u -r 1.382.2.417 -r 1.382.2.418 src/compose.c; cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/quote_fmt.c; cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/quote_fmt.h; cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.36 -r 1.22.2.37 src/quote_fmt_parse.y; ) > 3.0.2cvs79.patchset +( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpcore/select-keys.c; ) > 3.0.2cvs80.patchset diff --git a/configure.ac b/configure.ac index 92b8412e5..e16079645 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=79 +EXTRA_VERSION=80 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c index ae90f91ed..5c4bf5770 100644 --- a/src/plugins/pgpcore/select-keys.c +++ b/src/plugins/pgpcore/select-keys.c @@ -313,10 +313,13 @@ fill_clist (struct select_keys_s *sk, const char *pattern, gpgme_protocol_t prot update_progress (sk, ++running, pattern); while ( !(err = gpgme_op_keylist_next ( ctx, &key )) ) { gpgme_user_id_t uid = key->uids; + if (!key->can_encrypt) + continue; debug_print ("%% %s:%d: insert\n", __FILE__ ,__LINE__ ); set_row (clist, key, proto ); for (; uid; uid = uid->next) { gchar *raw_mail = NULL; + if (!uid->email) continue; raw_mail = g_strdup(uid->email);