revert
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 12 Jul 2001 13:21:26 +0000 (13:21 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 12 Jul 2001 13:21:26 +0000 (13:21 +0000)
ChangeLog.claws
src/Makefile.am
src/summaryview.c

index cff9bdf..934a0f6 100644 (file)
@@ -1,3 +1,16 @@
+2001-07-11 [alfons]
+
+       Prerelease before 0.5.0claws. Please test.
+       This version is temporarily tagged as VERSION_0_5_0_TEST
+
+       * src/matcher.[ch], src/summaryview.c, src/scoring.[ch]
+         src/prefs_scoring.c, src/prefs_matcher.c, 
+         src/prefs_filtering.c, src/mbox.c, 
+         src/main.c, src/inc.c, src/filtering.[ch]
+               revert new Hoa's new matcher (does not work yet)
+
+       * src/Makefile.am
+               clean up
 
 2001-07-10
 
index 92a724b..cee52c1 100644 (file)
@@ -89,8 +89,6 @@ sylpheed_SOURCES = \
        mbox_folder.c mbox_folder.h \
        quote_fmt_lex.l quote_fmt_lex.h \
        quote_fmt_parse.y quote_fmt.h \
-       matcher_parser_lex.l matcher_parser_lex.h \
-       matcher_parser_parse.y matcher_parser.h \
        addressitem.h \
        mgutils.c mgutils.h \
        vcard.c vcard.h \
@@ -103,7 +101,6 @@ sylpheed_SOURCES = \
 
 EXTRA_DIST = \
        quote_fmt_parse.h \
-       matcher_parser_parse.h \
        pixmaps/clip.xpm \
        pixmaps/deleted.xpm \
        pixmaps/dir-close.xpm \
@@ -180,8 +177,5 @@ YFLAGS = -d
 BUILT_SOURCES = \
        quote_fmt_lex.c \
        quote_fmt_parse.c \
-       quote_fmt_parse.h \
-       matcher_parser_lex.c \
-       matcher_parser_parse.c \
-       matcher_parser_parse.h
+       quote_fmt_parse.h
        
index 77a471f..feb91de 100644 (file)
@@ -3051,7 +3051,7 @@ void summary_filter(SummaryView *summaryview)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       if (global_filtering == NULL) {
+       if (prefs_filtering == NULL) {
                gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                        GTK_CTREE_FUNC(summary_filter_func),
                                        summaryview);
@@ -3094,7 +3094,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
        gchar *file;
        FolderItem *dest;
 
-       if (global_filtering == NULL) {
+       if (prefs_filtering == NULL) {
                /* old filtering */
                file = procmsg_get_message_file_path(msginfo);
                dest = filter_get_dest_folder(prefs_common.fltlist, file);
@@ -3105,7 +3105,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                        summary_move_row_to(summaryview, node, dest);
        }
        else
-               filter_msginfo_move_or_delete(global_filtering, msginfo,
+               filter_msginfo_move_or_delete(prefs_filtering, msginfo,
                                              summaryview->folder_table);
 }