From bbe7d54e1853420f89bfdd7151d85f2bc84da129 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Mon, 13 Nov 2006 14:04:07 +0000 Subject: [PATCH] 2006-11-13 [wwp] 2.6.0cvs40 * src/plugins/pgpinline/pgpinline.c fix candidate for bug #1057, thanks to Colin. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpinline/pgpinline.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 033d71e7d..f88e63789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-13 [wwp] 2.6.0cvs40 + + * src/plugins/pgpinline/pgpinline.c + fix candidate for bug #1057, thanks to Colin. + 2006-11-13 [wwp] 2.6.0cvs39 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index d01cfc1ff..9b458dd16 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2064,3 +2064,4 @@ ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/plugins/pgpmime/pgpmime.c; ) > 2.6.0cvs37.patchset ( 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 diff --git a/configure.ac b/configure.ac index 7f7fccd1f..2d12c24f6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=39 +EXTRA_VERSION=40 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c index c7ae09380..1e31f863e 100644 --- a/src/plugins/pgpinline/pgpinline.c +++ b/src/plugins/pgpinline/pgpinline.c @@ -490,7 +490,7 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account) gchar *sigcontent; gpgme_ctx_t ctx; gpgme_data_t gpgtext, gpgsig; - guint len; + size_t len; gpgme_error_t err; struct passphrase_cb_info_s info; gpgme_sign_result_t result = NULL; @@ -627,7 +627,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data) MimeInfo *msgcontent; FILE *fp; gchar *enccontent; - guint len; + size_t len; gchar *textstr, *tmp; gpgme_data_t gpgtext, gpgenc; gpgme_ctx_t ctx; -- 2.25.1