2006-08-17 [colin] 2.4.0cvs61

	* src/plugins/pgpcore/select-keys.c
		Fix warnings :)

diff --git a/ChangeLog b/ChangeLog
index d73e76f4f3522f12c0ac32c8e747e94c907702e1..eab8f0cfa70fbe589568387b870b5a09325bf0a0 100644 (file)
--- 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 e83b812a91f7af7c27a38d44c631713c0ee8437c..7a001cb6323f419335c5fbc704f4d1d351f09ff4 100644 (file)
--- 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 0e1d5e107bf1fca59207695c9f69985dc3272e46..62d2d4bec29e32834dc0cb642a76508a00297908 100644 (file)
--- 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 924881cf87009c40cac63c5cc52b9f630b64966d..d494d60422c8c6211bf0c4a67d14e7156b85eebc 100644 (file)
--- 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 )) ) {