From c600243cbbc7c6dfdbd8515fd065edc1bb65f7cc Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 27 Jan 2005 11:15:17 +0000 Subject: [PATCH] 2005-01-27 [colin] 1.0.0cvs19.1 * src/procmime.c Sync with HEAD --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/procmime.c | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index d37fceca8..ac6ba3b82 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-01-27 [colin] 1.0.0cvs19.1 + + * src/procmime.c + Sync with HEAD + 2005-01-27 [colin] 1.0.0cvs18.1 * src/messageview.c diff --git a/PATCHSETS b/PATCHSETS index 0a31e2c15..87e2fb958 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -346,3 +346,4 @@ ( cvs diff -u -r 1.654.2.378 -r 1.654.2.379 configure.ac; cvs diff -u -r 1.2.4.2 -r 1.2.4.3 src/common/template.c; ) > 1.0.0cvs15.1.patchset ( cvs diff -u -r 1.382.2.87 -r 1.382.2.88 src/compose.c; ) > 1.0.0cvs15.2.patchset ( cvs diff -u -r 1.94.2.38 -r 1.94.2.39 src/messageview.c; cvs diff -u -r 1.395.2.47 -r 1.395.2.48 src/summaryview.c; cvs diff -u -r 1.274.2.27 -r 1.274.2.28 src/mainwindow.c; cvs diff -u -r 1.382.2.88 -r 1.382.2.89 src/compose.c; cvs diff -u -r 1.50.2.6 -r 1.50.2.7 src/compose.h; cvs diff -u -r 1.150.2.18 -r 1.150.2.19 src/procmsg.c; cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/procmsg.h; cvs diff -u -r 1.43.2.12 -r 1.43.2.13 src/toolbar.c; ) > 1.0.0cvs18.1.patchset +( cvs diff -u -r 1.49.2.29 -r 1.49.2.30 src/procmime.c; ) > 1.0.0cvs19.1.patchset diff --git a/configure.ac b/configure.ac index 81ab4d558..d5143d74c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=18 +EXTRA_VERSION=19 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/procmime.c b/src/procmime.c index 4e7cfa42d..b6b33d0b3 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -229,9 +229,14 @@ MimeInfo *procmime_scan_message(MsgInfo *msginfo) gchar *filename; MimeInfo *mimeinfo; - filename = procmsg_get_message_file(msginfo); - if (!filename) + filename = procmsg_get_message_file_path(msginfo); + if (!filename || !is_file_exist(filename)) { + g_free(filename); + filename = procmsg_get_message_file(msginfo); + } + if (!filename || !is_file_exist(filename)) return NULL; + if (msginfo->folder->stype != F_QUEUE && msginfo->folder->stype != F_DRAFT) mimeinfo = procmime_scan_file(filename); -- 2.25.1