From ec1e7ff038fb22c1d890cbefd43468bc9a83b6fb Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 14 Sep 2004 08:51:04 +0000 Subject: [PATCH] 2004-09-14 [colin] 0.9.12cvs99.3 * ChangeLog.claws * src/folder.c Sync with HEAD --- ChangeLog-gtk2.claws | 6 ++++++ ChangeLog.claws | 28 ++++++++++++++++++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 30 +++++++++++++++++------------- 5 files changed, 53 insertions(+), 14 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 2cf097c99..140687b0e 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2004-09-14 [colin] 0.9.12cvs99.3 + + * ChangeLog.claws + * src/folder.c + Sync with HEAD + 2004-09-09 [colin] 0.9.12cvs99.2 * src/action.c diff --git a/ChangeLog.claws b/ChangeLog.claws index 272b0f431..794bb51a5 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,31 @@ +2004-09-13 [christoph] 0.9.12cvs100 + + * src/folder.c + add NULL pointer checks to fix segfault when messages can + not be fetched + +2004-09-08 [colin] 0.9.12cvs99 + + * src/account.c + Remove a debug printf + +2004-09-08 [christoph] 0.9.12cvs98 + + * src/procmsg.[ch] + change MSG_CACHED (unused in claws) to MSG_SCANNED to remember + if the message structure has been scanned + + * src/folder.c + o scan structure when the mail is fetched for the first time + to prevent unnecessary fetching of messages while scanning + the folder for messages + o revert 0.9.12cvs24 + + * src/plugins/pgpmime/pgpmime.c + check signature if auto signature checking is enabled when the + signature status is requested for first time and not when + checking if a part has a signature + 2004-09-07 [colin] 0.9.12cvs97 * src/inc.c diff --git a/PATCHSETS b/PATCHSETS index 81cc127e3..62da4adda 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -166,3 +166,4 @@ ( cvs diff -u -r 1.395.2.32 -r 1.395.2.33 src/summaryview.c; ) > 0.9.12cvs97.2.patchset ( cvs diff -u -r 1.61.2.10 -r 1.61.2.11 src/account.c; cvs diff -u -r 1.213.2.15 -r 1.213.2.16 src/folder.c; cvs diff -u -r 1.150.2.8 -r 1.150.2.9 src/procmsg.c; cvs diff -u -r 1.60.2.7 -r 1.60.2.8 src/procmsg.h; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs99.1.patchset ( cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/action.c; ) > 0.9.12cvs99.2.patchset +( cvs diff -u -r 1.2504.2.19 -r 1.2504.2.20 ChangeLog.claws; cvs diff -u -r 1.213.2.16 -r 1.213.2.17 src/folder.c; ) > 0.9.12cvs99.3.patchset diff --git a/configure.ac b/configure.ac index 9b9078ec4..b0e218136 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=99 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.2 +EXTRA_GTK2_VERSION=.3 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/folder.c b/src/folder.c index 9d8c01517..8d023be46 100644 --- a/src/folder.c +++ b/src/folder.c @@ -2104,20 +2104,24 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num) msgfile = folder->klass->fetch_msg(folder, item, num); - msginfo = folder_item_get_msginfo(item, num); - if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) { - MimeInfo *mimeinfo; - - if (msginfo->folder->stype != F_QUEUE && - msginfo->folder->stype != F_DRAFT) - mimeinfo = procmime_scan_file(msgfile); - else - mimeinfo = procmime_scan_queue_file(msgfile); - /* check for attachments */ - g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo); - procmime_mimeinfo_free_all(mimeinfo); + if (msgfile != NULL) { + msginfo = folder_item_get_msginfo(item, num); + if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) { + MimeInfo *mimeinfo; + + if (msginfo->folder->stype != F_QUEUE && + msginfo->folder->stype != F_DRAFT) + mimeinfo = procmime_scan_file(msgfile); + else + mimeinfo = procmime_scan_queue_file(msgfile); + /* check for attachments */ + if (mimeinfo != NULL) { + g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo); + procmime_mimeinfo_free_all(mimeinfo); - procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED); + procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED); + } + } } return msgfile; -- 2.25.1