From: Paul Mangan Date: Wed, 4 Jan 2006 09:57:01 +0000 (+0000) Subject: 2006-01-04 [paul] 1.9.100cvs123 X-Git-Tag: rel_2_0_0~88 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8f4097d335521f71cfaba051c00401d0e54f4e82 2006-01-04 [paul] 1.9.100cvs123 * src/plugins/pgpmime/pgpmime.c better debug information when signing Patch by Ivan F. Martinez --- diff --git a/ChangeLog b/ChangeLog index 2b8732213..7fda5af81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-04 [paul] 1.9.100cvs123 + + * src/plugins/pgpmime/pgpmime.c + better debug information when signing + Patch by Ivan F. Martinez + 2006-01-03 [colin] 1.9.100cvs122 * configure.ac diff --git a/PATCHSETS b/PATCHSETS index e55a736b9..570b847d5 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1106,3 +1106,4 @@ ( cvs diff -u -r 1.94.2.71 -r 1.94.2.72 src/messageview.c; ) > 1.9.100cvs120.patchset ( cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/common/prefs.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/sgpgme.c; ) > 1.9.100cvs121.patchset ( cvs diff -u -r 1.654.2.1151 -r 1.654.2.1152 configure.ac; ) > 1.9.100cvs122.patchset +( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpmime/pgpmime.c; ) > 1.9.100cvs123.patchset diff --git a/configure.ac b/configure.ac index 0a4a99a50..6d7752dad 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=122 +EXTRA_VERSION=123 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c index 2784e53bc..5a3324ba9 100644 --- a/src/plugins/pgpmime/pgpmime.c +++ b/src/plugins/pgpmime/pgpmime.c @@ -398,6 +398,7 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account) gchar *sigcontent; gpgme_ctx_t ctx; gpgme_data_t gpgtext, gpgsig; + gpgme_error_t err; size_t len; struct passphrase_cb_info_s info; gpgme_sign_result_t result = NULL; @@ -467,12 +468,16 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account) return FALSE; } - if (!getenv("GPG_AGENT_INFO")) { - info.c = ctx; + if (getenv("GPG_AGENT_INFO")) { + debug_print("GPG_AGENT_INFO environment defined, running without passphrase callback\n"); + } else { + info.c = ctx; gpgme_set_passphrase_cb (ctx, gpgmegtk_passphrase_cb, &info); } - if (gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH) != GPG_ERR_NO_ERROR) { + err = gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH); + if (err != GPG_ERR_NO_ERROR) { + debug_print("gpgme_op_sign error : %x\n", err); gpgme_release(ctx); return FALSE; } @@ -487,6 +492,7 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account) } } else { /* can't get result (maybe no signing key?) */ + debug_print("gpgme_op_sign_result error\n"); return FALSE; }