2004-09-14 [colin] 0.9.12cvs99.3
authorColin Leroy <colin@colino.net>
Tue, 14 Sep 2004 08:51:04 +0000 (08:51 +0000)
committerColin Leroy <colin@colino.net>
Tue, 14 Sep 2004 08:51:04 +0000 (08:51 +0000)
* ChangeLog.claws
* src/folder.c
Sync with HEAD

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

index 2cf097c99769b3cad2a453a1f5133fe335c1cdb3..140687b0e02abbd6cea26c2164a5e6a6054f69df 100644 (file)
@@ -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
index 272b0f431b9cabf0dace29bfcd0f54a9b9ccfbdc..794bb51a54b89d5ece84df6ee48df4db41e5ecb7 100644 (file)
@@ -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
index 81cc127e333b856025cec5becd7256fd60f0a1e3..62da4adda274e3fd3569da9c43f55c6f28bf5e4a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 9b9078ec4c1bc29cfe3ee11f54d26ca8d8762ed7..b0e218136d6c86e447f4fc1dbe5a4e17a2ff5499 100644 (file)
@@ -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}
index 9d8c01517dc555f01e48c90098f336bbc4c31ee6..8d023be4662047b48b1cf30ca2753a31da994516 100644 (file)
@@ -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;