* src/folder.c

        fix segfault when deleting messages from IMAP folders
        (closes bug [ 635641 ] Crash deleting mail in IMAP trash)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 038da8465077387c7b2687d0aed97e056627b834..e653c0e2b20e14163960f14b2d10dcce67abfad1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-11-14 [christoph] 0.8.5claws150
+
+       * src/folder.c
+               fix segfault when deleting messages from IMAP folders
+               (closes bug [ 635641 ] Crash deleting mail in IMAP trash)
+
 2002-11-14 [colin]     0.8.5claws149
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 9ecae07ddee5b5504b275373c7d9637cfd04d02e..43f5c3be54f1c043610e0f6b315fdd56a0080e67 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws149
+EXTRA_VERSION=claws150
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index bf8c67bd79775e7ab9f652eb4e03843692758c6c..5f81a6f0fb10a60020ba88b1ecd4c9383f900689 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2011,18 +2011,19 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        Folder *folder;
        gint ret = 0;
 
+       folder = item->folder;
+
        g_return_val_if_fail(item != NULL, -1);
        
-       folder = item->folder;
+       if (!item->cache) folder_item_read_cache(item);
+
        if (folder->remove_msgs) {
                ret = folder->remove_msgs(folder, item, msglist);
                if (ret == 0)
-                       folder->scan(folder);
+                       folder_item_scan(item);
                return ret;
        }
 
-       if (!item->cache) folder_item_read_cache(item);
-
        while (msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;