From: Colin Leroy Date: Thu, 17 Aug 2006 20:28:43 +0000 (+0000) Subject: 2006-08-17 [colin] 2.4.0cvs61 X-Git-Tag: rel_2_5_0~163 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=230c410b05f37855cd0c9f8fa0d4d05e5d23b163 2006-08-17 [colin] 2.4.0cvs61 * src/plugins/pgpcore/select-keys.c Fix warnings :) --- diff --git a/ChangeLog b/ChangeLog index d73e76f4f..eab8f0cfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-17 [colin] 2.4.0cvs61 + + * src/plugins/pgpcore/select-keys.c + Fix warnings :) + 2006-08-17 [colin] 2.4.0cvs60 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index e83b812a9..7a001cb63 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1752,3 +1752,4 @@ ( cvs diff -u -r 1.83.2.79 -r 1.83.2.80 src/mimeview.c; cvs diff -u -r 1.204.2.96 -r 1.204.2.97 src/prefs_common.c; cvs diff -u -r 1.103.2.57 -r 1.103.2.58 src/prefs_common.h; cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/prefs_ext_prog.c; cvs diff -u -r 1.96.2.137 -r 1.96.2.138 src/textview.c; ) > 2.4.0cvs58.patchset ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/select-keys.c; ) > 2.4.0cvs59.patchset ( cvs diff -u -r 1.382.2.301 -r 1.382.2.302 src/compose.c; ) > 2.4.0cvs60.patchset +( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/select-keys.c; ) > 2.4.0cvs61.patchset diff --git a/configure.ac b/configure.ac index 0e1d5e107..62d2d4bec 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=60 +EXTRA_VERSION=61 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c index 924881cf8..d494d6042 100644 --- a/src/plugins/pgpcore/select-keys.c +++ b/src/plugins/pgpcore/select-keys.c @@ -155,7 +155,7 @@ gpgmegtk_recipient_selection (GSList *recp_names, SelectionResult *result, sk.result = KEY_SELECTION_OK; gpgme_release (sk.select_ctx); sk.select_ctx = NULL; - printf("used %s\n", key->uids->email); + debug_print("used %s\n", key->uids->email); } key = NULL; if (recp_names) @@ -287,7 +287,7 @@ fill_clist (struct select_keys_s *sk, const char *pattern, gpgme_protocol_t prot pattern, gpgme_strerror (err)); sk->select_ctx = NULL; gpgme_release(ctx); - return FALSE; + return NULL; } update_progress (sk, ++running, pattern); while ( !(err = gpgme_op_keylist_next ( ctx, &key )) ) {