0.9.4claws36
[claws.git] / src / prefs_filtering.c
index 7263f6c696db45b04f5901f9dfa94f36e9cc763a..16c373e854563e06d28ae80380353f0c2ad263c6 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 #include "intl.h"
 #include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "prefs_matcher.h"
 #include "prefs_filtering.h"
 #include "prefs_common.h"
 #include "addr_compl.h"
 #include "colorlabel.h"
 
+#include "matcher_parser.h"
+#include "matcher.h"
+#include "prefs_filtering_action.h"
+
 static struct Filtering {
        GtkWidget *window;
 
        GtkWidget *ok_btn;
        GtkWidget *cond_entry;
-       GtkWidget *action_list;
-       GtkWidget *action_combo;
-       GtkWidget *account_list;
-       GtkWidget *account_combo;
-       GtkWidget *dest_entry;
-       GtkWidget *dest_btn;
-       GtkWidget *dest_label;
-       GtkWidget *exec_label;
-       GtkWidget *exec_btn;
-
-       GtkWidget *color_label;
-       GtkWidget *color_optmenu;
+       GtkWidget *action_entry;
 
        GtkWidget *cond_clist;
-
-       /* need this to make address completion entry work */
-       gint current_action;
 } filtering;
 
-#define VSPACING               12
-#define VSPACING_NARROW                4
-#define DEFAULT_ENTRY_WIDTH    80
-#define PREFSBUFSIZE           1024
-
 /* widget creating functions */
 static void prefs_filtering_create             (void);
 
-static void prefs_filtering_set_dialog (void);
+static void prefs_filtering_set_dialog (const gchar *header,
+                                        const gchar *key);
 static void prefs_filtering_set_list   (void);
 
 /* callback functions */
-/* static void prefs_filtering_select_dest_cb  (void); */
 static void prefs_filtering_register_cb        (void);
 static void prefs_filtering_substitute_cb      (void);
 static void prefs_filtering_delete_cb  (void);
 static void prefs_filtering_up         (void);
-static void prefs_filtering_down               (void);
-static void prefs_filtering_select             (GtkCList       *clist,
+static void prefs_filtering_down       (void);
+static void prefs_filtering_select     (GtkCList       *clist,
                                         gint            row,
                                         gint            column,
                                         GdkEvent       *event);
@@ -103,135 +88,47 @@ static gint prefs_filtering_deleted       (GtkWidget      *widget,
 static void prefs_filtering_key_pressed        (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
-static void prefs_filtering_cancel             (void);
+static void prefs_filtering_cancel     (void);
 static void prefs_filtering_ok         (void);
 
 static void prefs_filtering_condition_define   (void);
-static gint prefs_filtering_clist_set_row(gint row, FilteringProp * prop);
-static void prefs_filtering_select_dest(void);
-static void prefs_filtering_action_select(GtkList *list,
-                                         GtkWidget *widget, 
-                                         gpointer user_data);
-static void prefs_filtering_action_selection_changed(GtkList *list,
-                                                    gpointer user_data);
+static void prefs_filtering_action_define(void);
+static gint prefs_filtering_clist_set_row      (gint row, FilteringProp * prop);
                                          
-static void prefs_filtering_reset_dialog(void);
-
-enum {
-       ACTION_MOVE = 0,
-       ACTION_COPY = 1,
-       ACTION_DELETE = 2,
-       ACTION_MARK = 3,
-       ACTION_UNMARK = 4,
-       ACTION_MARK_AS_READ = 5,
-       ACTION_MARK_AS_UNREAD = 6,
-       ACTION_FORWARD = 7,
-       ACTION_FORWARD_AS_ATTACHMENT = 8,
-       ACTION_EXECUTE = 9,
-       ACTION_COLOR = 10
-};
-
-static gint get_sel_from_list(GtkList * list)
-{
-       gint row = 0;
-       void * sel;
-       GList * child;
-
-       if (list->selection == NULL)
-               return -1;
-
-       sel = list->selection->data;
-       for(child = list->children ; child != NULL ;
-           child = g_list_next(child)) {
-               if (child->data == sel)
-                       return row;
-               row ++;
-       }
-       
-       return row;
-}
-
-static gint get_account_id_from_list_id(gint list_id)
+static void prefs_filtering_reset_dialog       (void);
+static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data);
+static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data);
+
+static FolderItem * cur_item = NULL; /* folder (if dialog opened for processing) */
+
+typedef enum Action_ {
+       ACTION_MOVE,
+       ACTION_COPY,
+       ACTION_DELETE,
+       ACTION_MARK,
+       ACTION_UNMARK,
+       ACTION_LOCK,
+       ACTION_UNLOCK,
+       ACTION_MARK_AS_READ,
+       ACTION_MARK_AS_UNREAD,
+       ACTION_FORWARD,
+       ACTION_FORWARD_AS_ATTACHMENT,
+       ACTION_REDIRECT,
+       ACTION_EXECUTE,
+       ACTION_COLOR,
+       /* add other action constants */
+} Action;
+
+void prefs_filtering_open(FolderItem * item,
+                         const gchar *header,
+                         const gchar *key)
 {
-       GList * accounts;
-
-       for (accounts = account_get_list() ; accounts != NULL;
-            accounts = accounts->next) {
-               PrefsAccount *ac = (PrefsAccount *)accounts->data;
-
-               if (list_id == 0)
-                       return ac->account_id;
-               list_id--;
-       }
-       return 0;
-}
-
-static gint get_list_id_from_account_id(gint account_id)
-{
-       GList * accounts;
-       gint list_id = 0;
-
-       for (accounts = account_get_list() ; accounts != NULL;
-            accounts = accounts->next) {
-               PrefsAccount *ac = (PrefsAccount *)accounts->data;
-
-               if (account_id == ac->account_id)
-                       return list_id;
-               list_id++;
-       }
-       return 0;
-}
+       gchar *esckey;
 
-static gint prefs_filtering_get_matching_from_action(gint action_id)
-{
-       switch(action_id) {
-       case ACTION_MOVE:
-               return MATCHING_ACTION_MOVE;
-       case ACTION_COPY:
-               return MATCHING_ACTION_COPY;
-       case ACTION_DELETE:
-               return MATCHING_ACTION_DELETE;
-       case ACTION_MARK:
-               return MATCHING_ACTION_MARK;
-       case ACTION_UNMARK:
-               return MATCHING_ACTION_UNMARK;
-       case ACTION_MARK_AS_READ:
-               return MATCHING_ACTION_MARK_AS_READ;
-       case ACTION_MARK_AS_UNREAD:
-               return MATCHING_ACTION_MARK_AS_UNREAD;
-       case ACTION_FORWARD:
-               return MATCHING_ACTION_FORWARD;
-       case ACTION_FORWARD_AS_ATTACHMENT:
-               return MATCHING_ACTION_FORWARD_AS_ATTACHMENT;
-       case ACTION_EXECUTE:
-               return MATCHING_EXECUTE;
-       case ACTION_COLOR:
-               return MATCHING_ACTION_COLOR;
-       default:
-               return -1;
-       }
-}
-
-static gchar * action_text [] = {
-       N_("Move"),     
-       N_("Copy"), 
-       N_("Delete"),
-       N_("Mark"), 
-       N_("Unmark"), 
-       N_("Mark as read"), 
-       N_("Mark as unread"),
-       N_("Forward"), 
-       N_("Forward as attachment"), 
-       N_("Execute"),
-       N_("Color")
-};
-
-void prefs_filtering_open(void)
-{
        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
 
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!filtering.window) {
                prefs_filtering_create();
@@ -240,7 +137,11 @@ void prefs_filtering_open(void)
        manage_window_set_transient(GTK_WINDOW(filtering.window));
        gtk_widget_grab_focus(filtering.ok_btn);
 
-       prefs_filtering_set_dialog();
+       cur_item = item;
+
+       esckey = matcher_escape_str(key);
+       prefs_filtering_set_dialog(header, esckey);
+       g_free(esckey);
 
        gtk_widget_show(filtering.window);
 
@@ -253,6 +154,7 @@ static void prefs_filtering_close(void)
        end_address_completion();
        
        gtk_widget_hide(filtering.window);
+       inc_unlock();
 }
 
 static void prefs_filtering_create(void)
@@ -273,18 +175,8 @@ static void prefs_filtering_create(void)
        GtkWidget *cond_entry;
        GtkWidget *cond_btn;
        GtkWidget *action_label;
-       GtkWidget *action_list;
-       GtkWidget *action_combo;
-       GtkWidget *account_label;
-       GtkWidget *account_list;
-       GtkWidget *account_combo;
-       GtkWidget *dest_label;
-       GtkWidget *exec_label;
-       GtkWidget *dest_entry;
-       GtkWidget *dest_btn;
-       GtkWidget *exec_btn;
-       GtkWidget *color_label;
-       GtkWidget *color_optmenu;
+       GtkWidget *action_entry;
+       GtkWidget *action_btn;
 
        GtkWidget *reg_btn;
        GtkWidget *subst_btn;
@@ -298,17 +190,9 @@ static void prefs_filtering_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
-       GtkWidget *dummy;
-
-       GList *combo_items;
-       gint i;
-
-       GList *accounts;
-       GList * cur;
-
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
-       debug_print(_("Creating filtering setting window...\n"));
+       debug_print("Creating filtering configuration window...\n");
 
        window = gtk_window_new (GTK_WINDOW_DIALOG);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
@@ -327,15 +211,13 @@ static void prefs_filtering_create(void)
        gtk_widget_grab_default (ok_btn);
 
        gtk_window_set_title (GTK_WINDOW(window),
-                             _("Filtering setting"));
+                                   _("Filtering/Processing configuration"));
+
        gtk_signal_connect (GTK_OBJECT(window), "delete_event",
                            GTK_SIGNAL_FUNC(prefs_filtering_deleted), NULL);
        gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
                            GTK_SIGNAL_FUNC(prefs_filtering_key_pressed), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT (window);
        gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
                            GTK_SIGNAL_FUNC(prefs_filtering_ok), NULL);
        gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
@@ -352,13 +234,12 @@ static void prefs_filtering_create(void)
        gtk_box_pack_start (GTK_BOX (vbox1), cond_label, FALSE, FALSE, 0);
 
        hbox1 = gtk_hbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox1);
+       gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
 
        cond_entry = gtk_entry_new ();
        gtk_widget_show (cond_entry);
-//     gtk_widget_set_usize (cond_entry, 200, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), cond_entry, TRUE, TRUE, 0);
 
        cond_btn = gtk_button_new_with_label (_("Define ..."));
@@ -368,136 +249,27 @@ static void prefs_filtering_create(void)
                            GTK_SIGNAL_FUNC (prefs_filtering_condition_define),
                            NULL);
 
-       hbox1 = gtk_hbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
        action_label = gtk_label_new (_("Action"));
        gtk_widget_show (action_label);
        gtk_misc_set_alignment (GTK_MISC (action_label), 0, 0.5);
-       gtk_box_pack_start (GTK_BOX (hbox1), action_label, FALSE, FALSE, 0);
-
-       action_combo = gtk_combo_new ();
-       gtk_widget_show (action_combo);
-//     gtk_widget_set_usize (action_combo, 200, -1);
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(action_combo)->entry),
-                              FALSE);
-
-       combo_items = NULL;
-
-       for(i = 0 ; i < (gint) (sizeof(action_text) / sizeof(gchar *)) ;
-           i++) {
-               combo_items = g_list_append(combo_items,
-                                           (gpointer) _(action_text[i]));
-       }
-       gtk_combo_set_popdown_strings(GTK_COMBO(action_combo), combo_items);
-
-       g_list_free(combo_items);
-
-       gtk_box_pack_start (GTK_BOX (hbox1), action_combo,
-                           TRUE, TRUE, 0);
-       action_list = GTK_COMBO(action_combo)->list;
-       gtk_signal_connect (GTK_OBJECT (action_list), "select-child",
-                           GTK_SIGNAL_FUNC (prefs_filtering_action_select),
-                           NULL);
-
-       gtk_signal_connect(GTK_OBJECT(action_list), "selection-changed",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_selection_changed),
-                          NULL);
-
-       /* accounts */
+       gtk_box_pack_start (GTK_BOX (vbox1), action_label, FALSE, FALSE, 0);
 
        hbox1 = gtk_hbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox1);
+       gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
 
-       account_label = gtk_label_new (_("Account"));
-       gtk_widget_show (account_label);
-       gtk_misc_set_alignment (GTK_MISC (account_label), 0, 0.5);
-       gtk_box_pack_start (GTK_BOX (hbox1), account_label, FALSE, FALSE, 0);
-
-       account_combo = gtk_combo_new ();
-       gtk_widget_show (account_combo);
-
-       combo_items = NULL;
-       for (accounts = account_get_list() ; accounts != NULL;
-            accounts = accounts->next) {
-               PrefsAccount *ac = (PrefsAccount *)accounts->data;
-               gchar *name;
-
-               name = g_strdup_printf("%s <%s> (%s)",
-                                      ac->name, ac->address,
-                                      ac->account_name);
-               combo_items = g_list_append(combo_items, (gpointer) name);
-       }
-
-       gtk_combo_set_popdown_strings(GTK_COMBO(account_combo), combo_items);
-
-       for(cur = g_list_first(combo_items) ; cur != NULL ;
-           cur = g_list_next(cur))
-               g_free(cur->data);
-       g_list_free(combo_items);
-
-       gtk_box_pack_start (GTK_BOX (hbox1), account_combo,
-                           TRUE, TRUE, 0);
-       account_list = GTK_COMBO(account_combo)->list;
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(account_combo)->entry),
-                              FALSE);
-
-       /* destination */
-
-       hbox1 = gtk_hbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+       action_entry = gtk_entry_new ();
+       gtk_widget_show (action_entry);
+       gtk_box_pack_start (GTK_BOX (hbox1), action_entry, TRUE, TRUE, 0);
 
-       dest_label = gtk_label_new (_("Destination"));
-       gtk_widget_show (dest_label);
-       gtk_misc_set_alignment (GTK_MISC (dest_label), 0, 0.5);
-       gtk_box_pack_start (GTK_BOX (hbox1), dest_label, FALSE, FALSE, 0);
-
-       exec_label = gtk_label_new (_("Execute"));
-       gtk_widget_show (exec_label);
-       gtk_misc_set_alignment (GTK_MISC (exec_label), 0, 0.5);
-       gtk_box_pack_start (GTK_BOX (hbox1), exec_label, FALSE, FALSE, 0);
-       
-       color_label = gtk_label_new (_("Color"));
-       gtk_widget_show(color_label);
-       gtk_misc_set_alignment(GTK_MISC(color_label), 0, 0.5);
-       gtk_box_pack_start(GTK_BOX(hbox1), color_label, FALSE, FALSE, 0);
-
-       dest_entry = gtk_entry_new ();
-       gtk_widget_show (dest_entry);
-//     gtk_widget_set_usize (dest_entry, 200, -1);
-       gtk_box_pack_start (GTK_BOX (hbox1), dest_entry, TRUE, TRUE, 0);
-       
-       color_optmenu = gtk_option_menu_new();
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
-                                colorlabel_create_color_menu());
-//     gtk_widget_set_usize(color_optmenu, -1, -1);
-       gtk_box_pack_start(GTK_BOX(hbox1), color_optmenu, TRUE, TRUE, 0);
-
-       dest_btn = gtk_button_new_with_label (_("Select ..."));
-       gtk_widget_show (dest_btn);
-       gtk_box_pack_start (GTK_BOX (hbox1), dest_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (dest_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_select_dest),
+       action_btn = gtk_button_new_with_label (_("Define ..."));
+       gtk_widget_show (action_btn);
+       gtk_box_pack_start (GTK_BOX (hbox1), action_btn, FALSE, FALSE, 0);
+       gtk_signal_connect (GTK_OBJECT (action_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_filtering_action_define),
                            NULL);
 
-       exec_btn = gtk_button_new_with_label (_("Info ..."));
-       gtk_widget_show (exec_btn);
-       gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (exec_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_matcher_exec_info),
-                           NULL);
-
-//     dummy = gtk_label_new("");
-//     gtk_widget_show (dummy);
-//     gtk_box_pack_start(GTK_BOX (hbox1), dummy, FALSE, FALSE, 0);
-       
-
        /* register / substitute / delete */
 
        reg_hbox = gtk_hbox_new (FALSE, 4);
@@ -513,13 +285,13 @@ static void prefs_filtering_create(void)
        gtk_widget_show (btn_hbox);
        gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-       reg_btn = gtk_button_new_with_label (_("Register"));
+       reg_btn = gtk_button_new_with_label (_("Add"));
        gtk_widget_show (reg_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
        gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
                            GTK_SIGNAL_FUNC (prefs_filtering_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label (_(" Substitute "));
+       subst_btn = gtk_button_new_with_label (_("  Replace  "));
        gtk_widget_show (subst_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
        gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
@@ -545,6 +317,7 @@ static void prefs_filtering_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Current filtering/processing rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
@@ -580,20 +353,8 @@ static void prefs_filtering_create(void)
        filtering.ok_btn = ok_btn;
 
        filtering.cond_entry = cond_entry;
-       filtering.action_list = action_list;
-       filtering.action_combo = action_combo;
-       filtering.account_list = account_list;
-       filtering.account_combo = account_combo;
-       filtering.dest_entry = dest_entry;
-       filtering.dest_btn = dest_btn;
-       filtering.dest_label = dest_label;
-       filtering.exec_label = exec_label;
-       filtering.exec_btn = exec_btn;
-
+       filtering.action_entry = action_entry;
        filtering.cond_clist   = cond_clist;
-
-       filtering.color_label   = color_label;
-       filtering.color_optmenu = color_optmenu;
 }
 
 static void prefs_filtering_update_hscrollbar(void)
@@ -602,33 +363,248 @@ static void prefs_filtering_update_hscrollbar(void)
        gtk_clist_set_column_width(GTK_CLIST(filtering.cond_clist), 0, optwidth);
 }
 
-static void prefs_filtering_set_dialog(void)
+void prefs_filtering_rename_path(const gchar *old_path, const gchar *new_path)
+{
+       GList * cur;
+       gchar *paths[2] = {NULL, NULL};
+       paths[0] = (gchar*)old_path;
+       paths[1] = (gchar*)new_path;
+       for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+               Folder *folder;
+               folder = (Folder *) cur->data;
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                               prefs_filtering_rename_path_func, paths);
+       }
+       prefs_filtering_rename_path_func(NULL, paths);
+}
+
+static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
+{
+       GSList *cur;
+       gchar *old_path, *new_path;
+       gchar *base;
+       gchar *prefix;
+       gchar *suffix;
+       gchar *dest_path;
+       gchar *old_path_with_sep;
+       gint destlen;
+       gint prefixlen;
+       gint oldpathlen;
+       FolderItem *item;
+        GSList * action_cur;
+
+       old_path = ((gchar **)data)[0];
+       new_path = ((gchar **)data)[1];
+
+       g_return_val_if_fail(old_path != NULL, FALSE);
+       g_return_val_if_fail(new_path != NULL, FALSE);
+
+       oldpathlen = strlen(old_path);
+       old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
+       if (node == NULL)
+               cur = global_processing;
+       else {
+               item = node->data;
+               if (!item || !item->prefs) 
+                       return FALSE;
+               cur = item->prefs->processing;
+       }
+
+
+       for (; cur != NULL; cur = cur->next) {
+               FilteringProp   *filtering = (FilteringProp *)cur->data;
+                
+                for(action_cur = filtering->action_list ; action_cur != NULL ;
+                    action_cur = action_cur->next) {
+
+                        FilteringAction *action = action_cur->data;
+                        
+                        if (!action->destination) continue;
+                        
+                        destlen = strlen(action->destination);
+                        
+                        if (destlen > oldpathlen) {
+                                prefixlen = destlen - oldpathlen;
+                                suffix = action->destination + prefixlen;
+                                
+                                if (!strncmp(old_path, suffix, oldpathlen)) {
+                                        prefix = g_malloc0(prefixlen + 1);
+                                        strncpy2(prefix, action->destination, prefixlen);
+                                        
+                                        base = suffix + oldpathlen;
+                                        while (*base == G_DIR_SEPARATOR) base++;
+                                        if (*base == '\0')
+                                                dest_path = g_strconcat(prefix,
+                                                    G_DIR_SEPARATOR_S,
+                                                    new_path, NULL);
+                                        else
+                                                dest_path = g_strconcat(prefix,
+                                                    G_DIR_SEPARATOR_S,
+                                                    new_path,
+                                                    G_DIR_SEPARATOR_S,
+                                                    base, NULL);
+                                        
+                                        g_free(prefix);
+                                        g_free(action->destination);
+                                        action->destination = dest_path;
+                                } else { /* for non-leaf folders */
+                                        /* compare with trailing slash */
+                                        if (!strncmp(old_path_with_sep, action->destination, oldpathlen+1)) {
+                                                
+                                                suffix = action->destination + oldpathlen + 1;
+                                                dest_path = g_strconcat(new_path,
+                                                    G_DIR_SEPARATOR_S,
+                                                    suffix, NULL);
+                                                g_free(action->destination);
+                                                action->destination = dest_path;
+                                        }
+                                }
+                        } else {
+                                /* folder-moving a leaf */
+                                if (!strcmp(old_path, action->destination)) {          
+                                        dest_path = g_strdup(new_path);
+                                        g_free(action->destination);
+                                        action->destination = dest_path;
+                                }
+                        }
+                }
+        }
+        
+       g_free(old_path_with_sep);
+       prefs_matcher_write_config();
+
+       return FALSE;
+}
+
+void prefs_filtering_delete_path(const gchar *path)
+{
+       GList * cur;
+       for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+               Folder *folder;
+               folder = (Folder *) cur->data;
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                               prefs_filtering_delete_path_func, (gchar *)path);
+       }
+       prefs_filtering_delete_path_func(NULL, (gchar *)path);
+}
+
+static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
+{
+       GSList *cur, *filters, *duplist;
+       gchar *path = (gchar *) data;
+       gchar *suffix;
+       gint destlen;
+       gint prefixlen;
+       gint pathlen;
+       FolderItem *item;
+        GSList * action_cur;
+       
+       g_return_val_if_fail(path != NULL, FALSE);
+
+       pathlen = strlen(path);
+       if (node == NULL)
+               filters = global_processing;
+       else {
+               item = node->data;
+               if (!item || !item->prefs)
+                       return FALSE;
+               filters = item->prefs->processing;
+       }
+
+       duplist = g_slist_copy(filters);
+       for (cur = duplist ; cur != NULL; cur = g_slist_next(cur)) {
+               FilteringProp *filtering = (FilteringProp *) cur->data;
+                
+                for(action_cur = filtering->action_list ; action_cur != NULL ;
+                    action_cur = action_cur->next) {
+                
+                        FilteringAction *action;
+                        
+                        action = action_cur->data;
+                        
+                        if (!action->destination) continue;
+                        
+                        destlen = strlen(action->destination);
+                        
+                        if (destlen > pathlen) {
+                                prefixlen = destlen - pathlen;
+                                suffix = action->destination + prefixlen;
+                                
+                                if (suffix && !strncmp(path, suffix, pathlen)) {
+                                        filteringprop_free(filtering);
+                                        filters = g_slist_remove(filters, filtering);
+                                }
+                        } else if (strcmp(action->destination, path) == 0) {
+                                filteringprop_free(filtering);
+                                filters = g_slist_remove(filters, filtering);
+                        }
+                }
+        }                
+       g_slist_free(duplist);
+
+        if (node == NULL)
+                global_processing = filters;
+        else {
+                item = node->data;
+                if (!item || !item->prefs)
+                       return FALSE;
+                item->prefs->processing = filters;
+        }
+        
+       prefs_matcher_write_config();
+
+       return FALSE;
+}
+
+static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 {
        GtkCList *clist = GTK_CLIST(filtering.cond_clist);
        GSList *cur;
+       GSList * prefs_filtering;
+       gchar *cond_str[1];
+       gint row;
        
        gtk_clist_freeze(clist);
        gtk_clist_clear(clist);
 
-       prefs_filtering_clist_set_row(-1, NULL);
+       cond_str[0] = _("(New)");
+       row = gtk_clist_append(clist, cond_str);
+       gtk_clist_set_row_data(clist, row, NULL);
+
+       if (cur_item == NULL)
+               prefs_filtering = global_processing;
+       else
+               prefs_filtering = cur_item->prefs->processing;
+
        for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur)) {
                FilteringProp * prop = (FilteringProp *) cur->data;
 
-               prefs_filtering_clist_set_row(-1, prop);
+               cond_str[0] = filteringprop_to_string(prop);
+               subst_char(cond_str[0], '\t', ':');
+               row = gtk_clist_append(clist, cond_str);
+               gtk_clist_set_row_data(clist, row, prop);
+
+               g_free(cond_str[0]);
        }
 
        prefs_filtering_update_hscrollbar();
        gtk_clist_thaw(clist);
 
        prefs_filtering_reset_dialog();
+
+       if (header && key) {
+               gchar *match_str = g_strconcat(header, " ",
+                       get_matchparser_tab_str(MATCHTYPE_MATCHCASE),
+                       " \"", key, "\"", NULL);
+               gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), match_str);
+               g_free(match_str);
+       }
 }
 
 static void prefs_filtering_reset_dialog(void)
 {
-       gtk_list_select_item(GTK_LIST(filtering.action_list), 0);
-       gtk_list_select_item(GTK_LIST(filtering.account_list), 0);
-       gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), "");
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), "");
+       gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), "");
 }
 
 static void prefs_filtering_set_list(void)
@@ -637,7 +613,12 @@ static void prefs_filtering_set_list(void)
        FilteringProp *prop;
        GSList * cur;
        gchar * filtering_str;
-       gchar * tmp;
+       GSList * prefs_filtering;
+
+       if (cur_item == NULL)
+               prefs_filtering = global_processing;
+       else
+               prefs_filtering = cur_item->prefs->processing;
 
        for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur))
                filteringprop_free((FilteringProp *) cur->data);
@@ -647,14 +628,18 @@ static void prefs_filtering_set_list(void)
        while (gtk_clist_get_text(GTK_CLIST(filtering.cond_clist),
                                  row, 0, &filtering_str)) {
                if (strcmp(filtering_str, _("(New)")) != 0) {
-                       tmp = filtering_str;
-                       prop = filteringprop_parse(&tmp);
+                       prop = matcher_parser_get_filtering(filtering_str);
                        if (prop != NULL)
-                               prefs_filtering = g_slist_append(prefs_filtering,
-                                                              prop);
+                               prefs_filtering =
+                                       g_slist_append(prefs_filtering, prop);
                }
                row++;
        }
+
+       if (cur_item == NULL)
+               global_processing = prefs_filtering;
+       else
+               cur_item->prefs->processing = prefs_filtering;
 }
 
 static gint prefs_filtering_clist_set_row(gint row, FilteringProp * prop)
@@ -706,12 +691,9 @@ static void prefs_filtering_condition_define(void)
        cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
 
        if (*cond_str != '\0') {
-               gchar * tmp;
-               
-               tmp = cond_str;
-               matchers = matcherlist_parse(&tmp);
-               if (tmp == NULL)
-                       alertpanel_error(_("Match string is not valid."));
+               matchers = matcher_parser_get_cond(cond_str);
+               if (matchers == NULL)
+                       alertpanel_error(_("Condition string is not valid."));
        }
 
        prefs_matcher_open(matchers, prefs_filtering_condition_define_done);
@@ -720,69 +702,84 @@ static void prefs_filtering_condition_define(void)
                matcherlist_free(matchers);
 }
 
+static void prefs_filtering_action_define_done(GSList * action_list)
+{
+       gchar * str;
+
+       if (action_list == NULL)
+               return;
+
+       str = filteringaction_list_to_string(action_list);
+
+       if (str != NULL) {
+               gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), str);
+               g_free(str);
+       }
+}
+
+static void prefs_filtering_action_define(void)
+{
+       gchar * action_str;
+       GSList * action_list = NULL;
+
+       action_str = gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));
+
+       if (*action_str != '\0') {
+               action_list = matcher_parser_get_action_list(action_str);
+               if (action_list == NULL)
+                       alertpanel_error(_("Action string is not valid."));
+       }
+
+       prefs_filtering_action_open(action_list,
+            prefs_filtering_action_define_done);
+
+       if (action_list != NULL) {
+                GSList * cur;
+               for(cur = action_list ; cur != NULL ; cur = cur->next) {
+                        filteringaction_free(cur->data);
+                }
+        }
+}
+
 
 /* register / substitute delete buttons */
 
 
-static FilteringProp * prefs_filtering_dialog_to_filtering(void)
+static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
 {
        MatcherList * cond;
        gchar * cond_str;
+       gchar * action_str;
        FilteringProp * prop;
-       FilteringAction * action;
-       gchar * tmp;
-       gint list_id;
-       gint action_id;
-       gint action_type;
-       gint account_id;
-       gchar * destination;
-       gint labelcolor;
-       
+       GSList * action_list;
+
        cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
        if (*cond_str == '\0') {
-               alertpanel_error(_("Score is not set."));
+               if(alert == TRUE) alertpanel_error(_("Condition string is empty."));
                return NULL;
        }
 
-       action_id = get_sel_from_list(GTK_LIST(filtering.action_list));
-       action_type = prefs_filtering_get_matching_from_action(action_id);
-       list_id = get_sel_from_list(GTK_LIST(filtering.account_list));
-       account_id = get_account_id_from_list_id(list_id);
-
-       switch (action_id) {
-       case ACTION_MOVE:
-       case ACTION_COPY:
-       case ACTION_FORWARD:
-       case ACTION_FORWARD_AS_ATTACHMENT:
-       case ACTION_EXECUTE:
-               destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
-               if (*destination == '\0') {
-                       alertpanel_error(_("Destination is not set."));
-                       return NULL;
-               }
-               break;
-       case ACTION_COLOR:
-               labelcolor = colorlabel_get_color_menu_active_item(
-                       gtk_option_menu_get_menu(GTK_OPTION_MENU(filtering.color_optmenu)));
-               destination = NULL;     
-               break;
-       default:
-               destination = NULL;
-               break;
+       action_str = gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));
+       if (*action_str == '\0') {
+               if(alert == TRUE) alertpanel_error(_("Action string is empty."));
+               return NULL;
        }
-       
-       action = filteringaction_new(action_type, account_id, destination, labelcolor);
 
-       tmp = cond_str;
-       cond = matcherlist_parse(&tmp);
+       cond = matcher_parser_get_cond(cond_str);
 
-       if (tmp == NULL) {
-               alertpanel_error(_("Match string is not valid."));
-               filteringaction_free(action);
+       if (cond == NULL) {
+               if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
                return NULL;
        }
+        
+        action_list = matcher_parser_get_action_list(action_str);
 
-       prop = filteringprop_new(cond, action);
+       if (action_list == NULL) {
+               if(alert == TRUE) alertpanel_error(_("Action string is not valid."));
+               return NULL;
+       }
+
+       prop = filteringprop_new(cond, action_list);
 
        return prop;
 }
@@ -791,7 +788,7 @@ static void prefs_filtering_register_cb(void)
 {
        FilteringProp * prop;
        
-       prop = prefs_filtering_dialog_to_filtering();
+       prop = prefs_filtering_dialog_to_filtering(TRUE);
        if (prop == NULL)
                return;
        prefs_filtering_clist_set_row(-1, prop);
@@ -812,7 +809,7 @@ static void prefs_filtering_substitute_cb(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row == 0) return;
 
-       prop = prefs_filtering_dialog_to_filtering();
+       prop = prefs_filtering_dialog_to_filtering(TRUE);
        if (prop == NULL)
                return;
        prefs_filtering_clist_set_row(row, prop);
@@ -838,6 +835,8 @@ static void prefs_filtering_delete_cb(void)
 
        gtk_clist_remove(clist, row);
 
+       prefs_filtering_reset_dialog();
+
        prefs_filtering_update_hscrollbar();
 }
 
@@ -873,83 +872,27 @@ static void prefs_filtering_down(void)
        }
 }
 
-static void prefs_filtering_select_set(FilteringProp * prop)
+static void prefs_filtering_select_set(FilteringProp *prop)
 {
-       FilteringAction * action;
-       gchar * matcher_str;
-       gint list_id;
+       gchar *matcher_str;
+        gchar *action_str;
 
        prefs_filtering_reset_dialog();
 
-       action = prop->action;
-
        matcher_str = matcherlist_to_string(prop->matchers);
        if (matcher_str == NULL) {
-               filteringprop_free(prop);
                return;
        }
 
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), matcher_str);
-       
-       if (action->destination)
-               gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), action->destination);
-       else
-               gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), "");
-
-       switch(action->type) {
-       case MATCHING_ACTION_MOVE:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MOVE);
-               break;
-       case MATCHING_ACTION_COPY:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_COPY);
-               break;
-       case MATCHING_ACTION_DELETE:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_DELETE);
-               break;
-       case MATCHING_ACTION_MARK:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MARK);
-               break;
-       case MATCHING_ACTION_UNMARK:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_UNMARK);
-               break;
-       case MATCHING_ACTION_MARK_AS_READ:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MARK_AS_READ);
-               break;
-       case MATCHING_ACTION_MARK_AS_UNREAD:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MARK_AS_UNREAD);
-               break;
-       case MATCHING_ACTION_FORWARD:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_FORWARD);
-               list_id = get_list_id_from_account_id(action->account_id);
-               gtk_list_select_item(GTK_LIST(filtering.account_list),
-                                    list_id);
-               break;
-       case MATCHING_ACTION_FORWARD_AS_ATTACHMENT:
-               list_id = get_list_id_from_account_id(action->account_id);
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_FORWARD_AS_ATTACHMENT);
-               gtk_list_select_item(GTK_LIST(filtering.account_list),
-                                    list_id);
-               break;
-       case MATCHING_EXECUTE:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_EXECUTE);
-               break;
-       case MATCHING_ACTION_COLOR:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_COLOR);
-               gtk_option_menu_set_history(GTK_OPTION_MENU(filtering.color_optmenu), action->labelcolor);     
-               break;
+
+        action_str = filteringaction_list_to_string(prop->action_list);
+       if (matcher_str == NULL) {
+               return;
        }
+       gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), action_str);
 
+       g_free(action_str);
        g_free(matcher_str);
 }
 
@@ -957,7 +900,6 @@ static void prefs_filtering_select(GtkCList *clist, gint row, gint column,
                                GdkEvent *event)
 {
        FilteringProp * prop;
-       gchar * tmp;
        gchar * filtering_str;
 
        if (row == 0) {
@@ -969,9 +911,8 @@ static void prefs_filtering_select(GtkCList *clist, gint row, gint column,
                                row, 0, &filtering_str))
                return;
        
-       tmp = filtering_str;
-       prop = filteringprop_parse(&tmp);
-       if (tmp == NULL)
+       prop = matcher_parser_get_filtering(filtering_str);
+       if (prop == NULL)
                return;
 
        prefs_filtering_select_set(prop);
@@ -979,174 +920,6 @@ static void prefs_filtering_select(GtkCList *clist, gint row, gint column,
        filteringprop_free(prop);
 }
 
-static void prefs_filtering_select_dest(void)
-{
-       FolderItem *dest;
-       gchar * path;
-
-       dest = foldersel_folder_sel(NULL, NULL);
-       if (!dest) return;
-
-       path = folder_item_get_identifier(dest);
-
-       gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), path);
-       g_free(path);
-}
-
-static void prefs_filtering_action_selection_changed(GtkList *list,
-                                                    gpointer user_data)
-{
-       gint value;
-
-       value = get_sel_from_list(GTK_LIST(filtering.action_list));
-
-       if (filtering.current_action != value) {
-               if (filtering.current_action == ACTION_FORWARD 
-               ||  filtering.current_action == ACTION_FORWARD_AS_ATTACHMENT) {
-                       debug_print("unregistering address completion entry\n");
-                       address_completion_unregister_entry(GTK_ENTRY(filtering.dest_entry));
-               }
-               if (value == ACTION_FORWARD || value == ACTION_FORWARD_AS_ATTACHMENT) {
-                       debug_print("registering address completion entry\n");
-                       address_completion_register_entry(GTK_ENTRY(filtering.dest_entry));
-               }
-               filtering.current_action = value;
-       }
-}
-
-static void prefs_filtering_action_select(GtkList *list,
-                                         GtkWidget *widget,
-                                         gpointer user_data)
-{
-       gint value;
-
-       value = get_sel_from_list(GTK_LIST(filtering.action_list));
-
-       switch (value) {
-       case ACTION_MOVE:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
-               gtk_widget_show(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_COPY:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
-               gtk_widget_show(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_DELETE:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_MARK:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_UNMARK:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_MARK_AS_READ:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_MARK_AS_UNREAD:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_FORWARD:
-               gtk_widget_set_sensitive(filtering.account_combo, TRUE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_FORWARD_AS_ATTACHMENT:
-               gtk_widget_set_sensitive(filtering.account_combo, TRUE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_show(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_EXECUTE:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_show(filtering.dest_entry);
-               gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_hide(filtering.dest_label);
-               gtk_widget_show(filtering.exec_label);
-               gtk_widget_set_sensitive(filtering.exec_btn, FALSE);
-               gtk_widget_show(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
-       case ACTION_COLOR:
-               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
-               gtk_widget_hide(filtering.dest_entry);
-               gtk_widget_hide(filtering.dest_btn);
-               gtk_widget_hide(filtering.dest_label);
-               gtk_widget_hide(filtering.exec_label);
-               gtk_widget_show(filtering.exec_btn);
-               gtk_widget_set_sensitive(filtering.exec_btn, FALSE);
-               gtk_widget_show(filtering.color_optmenu);
-               gtk_widget_show(filtering.color_label);
-               break;
-       }
-}
 
 static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
@@ -1164,13 +937,39 @@ static void prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
 static void prefs_filtering_ok(void)
 {
+       FilteringProp * prop;
+       gchar * str;
+       gchar * filtering_str;
+       gint row = 1;
+        AlertValue val;
+       
+       prop = prefs_filtering_dialog_to_filtering(FALSE);
+       if (prop != NULL) {
+               str = filteringprop_to_string(prop);
+
+               while (gtk_clist_get_text(GTK_CLIST(filtering.cond_clist),
+                                         row, 0, &filtering_str)) {
+                       if (strcmp(filtering_str, str) == 0) break;
+                       row++;
+               }
+               if (strcmp(filtering_str, str) != 0) {
+                       val = alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                _("Yes"), _("No"), NULL);
+                       if (G_ALERTDEFAULT != val) {
+                               g_free(str);
+                               return;
+                       }
+               }
+               g_free(str);
+       }
        prefs_filtering_set_list();
-       prefs_filtering_write_config();
+       prefs_matcher_write_config();
        prefs_filtering_close();
 }
 
 static void prefs_filtering_cancel(void)
 {
-       prefs_filtering_read_config();
+       prefs_matcher_read_config();
        prefs_filtering_close();
 }