2005-01-27 [colin] 1.0.0cvs19.1
authorColin Leroy <colin@colino.net>
Thu, 27 Jan 2005 11:15:17 +0000 (11:15 +0000)
committerColin Leroy <colin@colino.net>
Thu, 27 Jan 2005 11:15:17 +0000 (11:15 +0000)
* src/procmime.c
Sync with HEAD

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/procmime.c

index d37fceca8414cd067ae39c270dc43ab147f7ff3b..ac6ba3b825437a99028fff10db60b6feb0d55b14 100644 (file)
@@ -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
index 0a31e2c156554e492d2007e4df0dbfd668d924c8..87e2fb95801a5bf9b8e9d0354fb219cfcb0b3a72 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 81ab4d558b88d965143a18fbac0c714f1b4bea4d..d5143d74c9760fce8db30aec2151327c253a34d4 100644 (file)
@@ -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
 
index 4e7cfa42d44aa13a8047fb8d9023fbc1bed13de9..b6b33d0b33a3cc56642e66c4b75c11b1b50ab686 100644 (file)
@@ -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);