From d456393da2e991beee8f5678b0802cf9ef9f455f Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Thu, 31 Oct 2002 13:06:34 +0000 Subject: [PATCH] remove main's 'filter' code --- ChangeLog.claws | 16 ++++++++++++++++ configure.in | 2 +- src/Makefile.am | 2 -- src/folderview.c | 33 ++++++++++----------------------- src/inc.c | 17 +---------------- src/main.c | 4 ---- src/mainwindow.c | 1 - src/mbox.c | 21 +++------------------ src/prefs_common.c | 1 - src/prefs_filtering.h | 10 ++++++++++ src/summaryview.c | 16 ++-------------- src/summaryview.h | 2 +- 12 files changed, 44 insertions(+), 81 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 1713db8d7..5bb22f5d7 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,19 @@ +2002-10-31 [paul] 0.8.5claws61 + + * src/prefs_filter.[ch] ** REMOVED ** + src/filter.[ch] ** REMOVED ** + + * src/Makefile.am + src/folderview.c + src/inc.c + src/main.c + src/mainwindow.c + src/mbox.c + src/prefs_common.c + src/prefs_filtering.c + src/summaryview.[ch] + remove main's 'filter' code + 2002-10-31 [paul] 0.8.5claws60 * src/summaryview.c diff --git a/configure.in b/configure.in index 95edb5aa0..1a2af885b 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=5 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws60 +EXTRA_VERSION=claws61 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/Makefile.am b/src/Makefile.am index 4ba1971b1..6b6c3544b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,6 @@ sylpheed_SOURCES = \ folder.c folder.h \ procmsg.c procmsg.h \ procheader.c procheader.h \ - filter.c filter.h \ compose.c compose.h \ gtkshruler.c gtkshruler.h \ gtksctree.c gtksctree.h \ @@ -28,7 +27,6 @@ sylpheed_SOURCES = \ stock_pixmap.c stock_pixmap.h \ prefs.c prefs.h \ prefs_common.c prefs_common.h \ - prefs_filter.c prefs_filter.h \ prefs_account.c prefs_account.h \ prefs_folder_item.c prefs_folder_item.h \ prefs_display_header.c prefs_display_header.h \ diff --git a/src/folderview.c b/src/folderview.c index 804565e49..183dec10a 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -54,7 +54,6 @@ #include "gtkutils.h" #include "prefs_common.h" #include "prefs_account.h" -#include "prefs_filter.h" #include "prefs_filtering.h" #include "prefs_scoring.h" #include "prefs_folder_item.h" @@ -2027,17 +2026,11 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action, } g_free(new_folder); - if (prefs_common.fltlist) { - if (folder_get_default_folder() == item->folder) - prefs_filter_rename_path(old_path, item->path); - new_id = folder_item_get_identifier(item); - prefs_filter_rename_path(old_id, new_id); - } else { - if (FOLDER_TYPE(item->folder) == F_MH) - prefs_filtering_rename_path(old_path, item->path); - new_id = folder_item_get_identifier(item); - prefs_filtering_rename_path(old_id, new_id); - } + if (FOLDER_TYPE(item->folder) == F_MH) + prefs_filtering_rename_path(old_path, item->path); + new_id = folder_item_get_identifier(item); + prefs_filtering_rename_path(old_id, new_id); + g_free(old_id); g_free(new_id); @@ -2156,17 +2149,11 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action, return; } - if (prefs_common.fltlist) { - if (folder_get_default_folder() == item->folder) - prefs_filter_delete_path(old_path); - prefs_filter_delete_path(old_id); - g_free(old_id); - } else { - if (FOLDER_TYPE(item->folder) == F_MH) - prefs_filtering_delete_path(old_path); - prefs_filtering_delete_path(old_id); - g_free(old_id); - } + if (FOLDER_TYPE(item->folder) == F_MH) + prefs_filtering_delete_path(old_path); + prefs_filtering_delete_path(old_id); + g_free(old_id); + if (folderview->opened == folderview->selected || gtk_ctree_is_ancestor(ctree, folderview->selected, diff --git a/src/inc.c b/src/inc.c index c8fd658ba..c66ecb53a 100644 --- a/src/inc.c +++ b/src/inc.c @@ -61,7 +61,6 @@ #include "progressdialog.h" #include "inputdialog.h" #include "alertpanel.h" -#include "filter.h" #include "automaton.h" #include "folder.h" #include "filtering.h" @@ -997,21 +996,7 @@ gint inc_drop_message(const gchar *file, Pop3State *state) } /* CLAWS: claws uses a global .processing folder for the filtering. */ - if (global_processing == NULL) { - if (state->ac_prefs->filter_on_recv) { - dropfolder = - filter_get_dest_folder(prefs_common.fltlist, file); - if (!dropfolder) dropfolder = inbox; - else if (!strcmp(dropfolder->path, FILTER_NOT_RECEIVE)) { - debug_print("a message won't be received\n"); - unlink(file); - return 1; - } - } else - dropfolder = inbox; - } else { - dropfolder = folder_get_default_processing(); - } + dropfolder = folder_get_default_processing(); /* add msg file to drop folder */ if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) { diff --git a/src/main.c b/src/main.c index c3abca9ca..5aaddc1b8 100644 --- a/src/main.c +++ b/src/main.c @@ -56,7 +56,6 @@ #include "folderview.h" #include "summaryview.h" #include "prefs_common.h" -#include "prefs_filter.h" #include "prefs_account.h" #include "prefs_actions.h" #include "scoring.h" @@ -289,8 +288,6 @@ int main(int argc, char *argv[]) prefs_common_save_config(); - prefs_filter_read_config(); - prefs_filter_write_config(); prefs_actions_read_config(); prefs_actions_write_config(); prefs_display_header_read_config(); @@ -551,7 +548,6 @@ void app_will_exit(GtkWidget *widget, gpointer data) main_window_get_size(mainwin); main_window_get_position(mainwin); prefs_common_save_config(); - prefs_filter_write_config(); account_save_config_all(); addressbook_export_to_file(); diff --git a/src/mainwindow.c b/src/mainwindow.c index c854ee822..c4eff5917 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -60,7 +60,6 @@ #include "import.h" #include "export.h" #include "prefs_common.h" -#include "prefs_filter.h" #include "prefs_actions.h" #include "prefs_filtering.h" #include "prefs_scoring.h" diff --git a/src/mbox.c b/src/mbox.c index 59cae3b1f..65f07bc28 100644 --- a/src/mbox.c +++ b/src/mbox.c @@ -36,7 +36,6 @@ #include "mbox.h" #include "procmsg.h" #include "folder.h" -#include "filter.h" #include "prefs_common.h" #include "prefs_account.h" #include "account.h" @@ -203,18 +202,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox) return -1; } - if (global_processing == NULL) { - /* old filtering */ - dropfolder = filter_get_dest_folder - (prefs_common.fltlist, tmp_file); - if (!dropfolder || - !strcmp(dropfolder->path, FILTER_NOT_RECEIVE)) - dropfolder = dest; - } else { - /* CLAWS: new filtering */ - dropfolder = folder_get_default_processing(); - } - + dropfolder = folder_get_default_processing(); if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, TRUE)) < 0) { fclose(mbox_fp); @@ -223,11 +211,8 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox) return -1; } - if (global_processing) { - /* CLAWS: new filtering */ - filter_message(global_processing, dest, - msgnum); - } + filter_message(global_processing, dest, + msgnum); msgs++; } while (from_line[0] != '\0'); diff --git a/src/prefs_common.c b/src/prefs_common.c index a7e428149..07360a332 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -903,7 +903,6 @@ static void prefs_common_apply (void); static void prefs_common_cancel (void); void prefs_common_init() { - prefs_common.fltlist = NULL; prefs_common.disphdr_list = NULL; } diff --git a/src/prefs_filtering.h b/src/prefs_filtering.h index 224d25e5a..b3d6b68a1 100644 --- a/src/prefs_filtering.h +++ b/src/prefs_filtering.h @@ -24,6 +24,16 @@ void prefs_scoring_read_config (void); void prefs_scoring_write_config (void); */ + +typedef enum +{ + FILTER_BY_NONE, + FILTER_BY_AUTO, + FILTER_BY_FROM, + FILTER_BY_TO, + FILTER_BY_SUBJECT +} PrefsFilterType; + void prefs_filtering_open (FolderItem * item, const gchar *header, const gchar *key); diff --git a/src/summaryview.c b/src/summaryview.c index ea9e54577..8b2c2f203 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -61,7 +61,6 @@ #include "sourcewindow.h" #include "prefs_common.h" #include "prefs_summary_column.h" -#include "prefs_filter.h" #include "prefs_filtering.h" #include "account.h" #include "compose.h" @@ -72,7 +71,6 @@ #include "alertpanel.h" #include "inputdialog.h" #include "statusbar.h" -#include "filter.h" #include "folder.h" #include "colorlabel.h" #include "inc.h" @@ -3817,7 +3815,7 @@ void summary_collapse_threads(SummaryView *summaryview) void summary_filter(SummaryView *summaryview) { - if (!prefs_common.fltlist && !global_processing) { + if (!global_processing) { alertpanel_error(_("No filter rules defined.")); return; } @@ -3877,17 +3875,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node, gchar *file; FolderItem *dest; - if (global_processing == NULL) { - /* old filtering */ - file = procmsg_get_message_file(msginfo); - dest = filter_get_dest_folder(prefs_common.fltlist, file); - g_free(file); - - if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 && - summaryview->folder_item != dest) - summary_move_row_to(summaryview, node, dest); - } else - filter_message_by_msginfo(global_processing, msginfo); + filter_message_by_msginfo(global_processing, msginfo); } void summary_filter_open(SummaryView *summaryview, PrefsFilterType type) diff --git a/src/summaryview.h b/src/summaryview.h index 2e60c6f6a..5b56d8793 100644 --- a/src/summaryview.h +++ b/src/summaryview.h @@ -37,9 +37,9 @@ typedef struct _SummaryColumnState SummaryColumnState; #include "headerview.h" #include "messageview.h" #include "compose.h" -#include "prefs_filter.h" #include "folder.h" #include "gtksctree.h" +#include "prefs_filtering.h" typedef enum { -- 2.25.1