From 4e7701affb8152d3247a566b7f74a7b972af83f0 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 22 Aug 2005 10:47:55 +0000 Subject: [PATCH] 2005-08-22 [paul] 1.9.13cvs47 * src/imap.c fix bug 789, 'SC crashes with imap (CVS ver)' Patch by Colin --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/imap.c | 6 ++++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 537dd6315..e28e3f8b1 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-08-22 [paul] 1.9.13cvs47 + + * src/imap.c + fix bug 789, 'SC crashes with imap (CVS ver)' + Patch by Colin + 2005-08-22 [paul] 1.9.13cvs46 * src/mimeview.c diff --git a/PATCHSETS b/PATCHSETS index 1bb3bf3df..c522253c0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -732,3 +732,4 @@ ( cvs diff -u -r 1.213.2.52 -r 1.213.2.53 src/folder.c; ) > 1.9.13cvs44.patchset ( cvs diff -u -r 1.395.2.115 -r 1.395.2.116 src/summaryview.c; ) > 1.9.13cvs45.patchset ( cvs diff -u -r 1.83.2.36 -r 1.83.2.37 src/mimeview.c; cvs diff -u -r 1.204.2.54 -r 1.204.2.55 src/prefs_common.c; cvs diff -u -r 1.96.2.70 -r 1.96.2.71 src/textview.c; cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/common/defs.h; ) > 1.9.13cvs46.patchset +( cvs diff -u -r 1.179.2.58 -r 1.179.2.59 src/imap.c; ) > 1.9.13cvs47.patchset diff --git a/configure.ac b/configure.ac index 114d59b62..9645988f2 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=46 +EXTRA_VERSION=47 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/imap.c b/src/imap.c index 418f6fdab..9e616c0f9 100644 --- a/src/imap.c +++ b/src/imap.c @@ -812,9 +812,11 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid, MsgInfo *msginfo = imap_parse_msg(filename, item); MsgInfo *cached = msgcache_get_msg(item->cache,uid); guint have_size = get_size_with_lfs(msginfo); - debug_print("message %d has been already %scached (%d/%d).\n", uid, + + if (cached) + debug_print("message %d has been already %scached (%d/%d).\n", uid, have_size == cached->size ? "fully ":"", - have_size, cached? (int)cached->size : -1); + have_size, cached->size); if (cached && (cached->size == have_size || !body)) { procmsg_msginfo_free(cached); -- 2.25.1