make filtering work too on local mbox (spool)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 58d59d4a9e53149a533b1c44685dfc378a566602..3142ad78eb05f68e70c36ae30b78dae6ca26ba46 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-07 [alfons]    0.6.5claws60
+
+       * src/mbox.c
+               make filtering also work on local spool mbox
+
 2001-12-07 [carsten]   0.6.5claws59
        * src/addressbook.c
                addressbook window gets a wmclass distinct from the main
@@ -48,6 +53,7 @@
                after switching between MVIEW_TEXT and MVIEW_MIME views
                without deselecting the selection first.
 
+>>>>>>> 1.507
 2001-12-06 [alfons]    0.6.5claws55
 
        * src/filtering.[ch]

diff --git a/configure.in b/configure.in
index 38c7b526f164d361dbebdc27fca96ebb83756edb..1c188cabccc52d163961bd4279d434e34d04eb7a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws59
+EXTRA_VERSION=claws60
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/mbox.c b/src/mbox.c
index e778c6f0e4a11898eac391476e95c174251db33c..e24a4aa8b926c2f534462117be76b09e95a6baff 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -62,6 +62,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
        gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE];
        gchar *tmp_file;
        gint msgs = 0;
+       FolderItem *inbox;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);
@@ -96,6 +97,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
        }
 
        tmp_file = get_tmp_file();
+       inbox    = folder_get_default_inbox();
 
        do {
                FILE *tmp_fp;
@@ -218,8 +220,8 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                                }
                        }
                        else {
-                               /* new filtering */
-                               dropfolder = dest;
+                               /* CLAWS: new filtering */
+                               dropfolder = folder_get_default_processing();
                        }
                } else
                        dropfolder = dest;
@@ -233,9 +235,9 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                folder_item_scan(dropfolder);
 
                if (global_processing) {
-                       /* new filtering */
+                       /* CLAWS: new filtering */
                        if (folder_table) {
-                               filter_message(global_processing, dropfolder,
+                               filter_message(global_processing, inbox,
                                               msgnum, folder_table);
                        }
                }