+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
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
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 \
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 \
#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"
}
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);
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,
#include "progressdialog.h"
#include "inputdialog.h"
#include "alertpanel.h"
-#include "filter.h"
#include "automaton.h"
#include "folder.h"
#include "filtering.h"
}
/* 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) {
#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"
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();
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();
#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"
#include "mbox.h"
#include "procmsg.h"
#include "folder.h"
-#include "filter.h"
#include "prefs_common.h"
#include "prefs_account.h"
#include "account.h"
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);
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');
static void prefs_common_cancel (void);
void prefs_common_init() {
- prefs_common.fltlist = NULL;
prefs_common.disphdr_list = NULL;
}
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);
#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"
#include "alertpanel.h"
#include "inputdialog.h"
#include "statusbar.h"
-#include "filter.h"
#include "folder.h"
#include "colorlabel.h"
#include "inc.h"
void summary_filter(SummaryView *summaryview)
{
- if (!prefs_common.fltlist && !global_processing) {
+ if (!global_processing) {
alertpanel_error(_("No filter rules defined."));
return;
}
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)
#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
{