From 741bd84d8da5fbee4b4f5000333aee451182ffd0 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 29 Aug 2005 08:29:19 +0000 Subject: [PATCH] 2005-08-29 [paul] 1.9.13cvs70 * src/plugins/pgpinline/pgpinline.c only initialise sig result if it's been handled Patch by Colin --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpinline/pgpinline.c | 12 +++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 05e864a52..20b6e5242 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-08-29 [paul] 1.9.13cvs70 + + * src/plugins/pgpinline/pgpinline.c + only initialise sig result if it's been handled + Patch by Colin + 2005-08-29 [paul] 1.9.13cvs69 Patches by Colin: diff --git a/PATCHSETS b/PATCHSETS index 66d54f948..5be547d4a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -755,3 +755,4 @@ ( cvs diff -u -r 1.179.2.62 -r 1.179.2.63 src/imap.c; ) > 1.9.13cvs67.patchset ( cvs diff -u -r 1.155.2.30 -r 1.155.2.31 src/Makefile.am; cvs diff -u -r 1.25.2.16 -r 1.25.2.17 src/stock_pixmap.c; cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/stock_pixmap.h; cvs diff -u -r 1.43.2.22 -r 1.43.2.23 src/toolbar.c; diff -u /dev/null src/pixmaps/trash_btn.xpm; ) > 1.9.13cvs68.patchset ( cvs diff -u -r 1.179.2.63 -r 1.179.2.64 src/imap.c; cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/stock_pixmap.h; cvs diff -u -r 1.36.2.41 -r 1.36.2.42 src/common/utils.c; cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/common/utils.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/trash_btn.xpm; ) > 1.9.13cvs69.patchset +( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/pgpinline.c; ) > 1.9.13cvs70.patchset diff --git a/configure.ac b/configure.ac index e948e2b6c..6bd63acf6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=13 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=69 +EXTRA_VERSION=70 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c index 742e1be8b..ed3893ba8 100644 --- a/src/plugins/pgpinline/pgpinline.c +++ b/src/plugins/pgpinline/pgpinline.c @@ -116,13 +116,6 @@ static gboolean pgpinline_is_signed(MimeInfo *mimeinfo) if (!textdata) return FALSE; - if (data == NULL) { - data = pgpinline_new_privacydata(); - mimeinfo->privacy = (PrivacyData *) data; - } - data->done_sigtest = TRUE; - data->is_signed = FALSE; - if ((sigpos = strstr(textdata, sig_indicator)) == NULL) { g_free(textdata); return FALSE; @@ -135,6 +128,11 @@ static gboolean pgpinline_is_signed(MimeInfo *mimeinfo) g_free(textdata); + if (data == NULL) { + data = pgpinline_new_privacydata(); + mimeinfo->privacy = (PrivacyData *) data; + } + data->done_sigtest = TRUE; data->is_signed = TRUE; return TRUE; -- 2.25.1