prefs_filtering.c - wrong widget were shown after creation
[claws.git] / src / prefs_filtering.c
index 40387e7fa12dae389a2c9367fe50e21b3286820d..77cf6f0aa95bfb2d853aed3fe8d139faf1e3e7c7 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"
@@ -51,6 +51,7 @@
 #include "colorlabel.h"
 
 #include "matcher_parser.h"
+#include "matcher.h"
 
 static struct Filtering {
        GtkWidget *window;
@@ -59,11 +60,13 @@ static struct Filtering {
        GtkWidget *cond_entry;
        GtkWidget *action_list;
        GtkWidget *action_combo;
+       GtkWidget *account_label;
        GtkWidget *account_list;
        GtkWidget *account_combo;
        GtkWidget *dest_entry;
        GtkWidget *dest_btn;
        GtkWidget *dest_label;
+       GtkWidget *recip_label;
        GtkWidget *exec_label;
        GtkWidget *exec_btn;
 
@@ -79,17 +82,17 @@ static struct Filtering {
 /* 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);
@@ -100,38 +103,72 @@ 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 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_reset_dialog(void);
-
-static FolderItem * cur_item = NULL;
-
-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_BOUNCE = 9,
-       ACTION_EXECUTE = 10,
-       ACTION_COLOR = 11,
-       ACTION_DELETE_ON_SERVER = 12,
+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;
+
+static struct {
+       gchar *text;
+       Action action;
+} action_text [] = {
+       { N_("Move"),                   ACTION_MOVE     },      
+       { N_("Copy"),                   ACTION_COPY     },
+       { N_("Delete"),                 ACTION_DELETE   },
+       { N_("Mark"),                   ACTION_MARK     },
+       { N_("Unmark"),                 ACTION_UNMARK   },
+       { N_("Lock"),                   ACTION_LOCK     },
+       { N_("Unlock"),                 ACTION_UNLOCK   },
+       { N_("Mark as read"),           ACTION_MARK_AS_READ },
+       { N_("Mark as unread"),         ACTION_MARK_AS_UNREAD },
+       { N_("Forward"),                ACTION_FORWARD  },
+       { N_("Forward as attachment"),  ACTION_FORWARD_AS_ATTACHMENT },
+       { N_("Redirect"),               ACTION_REDIRECT },
+       { N_("Execute"),                ACTION_EXECUTE  },
+       { N_("Color"),                  ACTION_COLOR    }
 };
 
+static const gchar *get_action_text(Action action)
+{
+       int n;
+       for (n = 0; n < sizeof action_text / sizeof action_text[0]; n++)
+               if (action_text[n].action == action)
+                       return action_text[n].text;
+       return "";                      
+}
+
 static gint get_sel_from_list(GtkList * list)
 {
        gint row = 0;
@@ -183,9 +220,9 @@ static gint get_list_id_from_account_id(gint account_id)
        return 0;
 }
 
-static gint prefs_filtering_get_matching_from_action(gint action_id)
+static gint prefs_filtering_get_matching_from_action(Action action_id)
 {
-       switch(action_id) {
+       switch (action_id) {
        case ACTION_MOVE:
                return MATCHACTION_MOVE;
        case ACTION_COPY:
@@ -196,6 +233,10 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
                return MATCHACTION_MARK;
        case ACTION_UNMARK:
                return MATCHACTION_UNMARK;
+       case ACTION_LOCK:
+               return MATCHACTION_LOCK;
+       case ACTION_UNLOCK:
+               return MATCHACTION_UNLOCK;
        case ACTION_MARK_AS_READ:
                return MATCHACTION_MARK_AS_READ;
        case ACTION_MARK_AS_UNREAD:
@@ -204,37 +245,23 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
                return MATCHACTION_FORWARD;
        case ACTION_FORWARD_AS_ATTACHMENT:
                return MATCHACTION_FORWARD_AS_ATTACHMENT;
-       case ACTION_BOUNCE:
-               return MATCHACTION_BOUNCE;
+       case ACTION_REDIRECT:
+               return MATCHACTION_REDIRECT;
        case ACTION_EXECUTE:
                return MATCHACTION_EXECUTE;
        case ACTION_COLOR:
                return MATCHACTION_COLOR;
-       case ACTION_DELETE_ON_SERVER:
-               return MATCHACTION_DELETE_ON_SERVER;
        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_("Bounce"), 
-       N_("Execute"),
-       N_("Color"),
-       N_("Delete on Server")
-};
-
-void prefs_filtering_open(FolderItem * item)
+void prefs_filtering_open(FolderItem * item,
+                         const gchar *header,
+                         const gchar *key)
 {
+       gchar *esckey;
+
        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
 
@@ -249,7 +276,9 @@ void prefs_filtering_open(FolderItem * item)
 
        cur_item = item;
 
-       prefs_filtering_set_dialog();
+       esckey = matcher_escape_str(key);
+       prefs_filtering_set_dialog(header, esckey);
+       g_free(esckey);
 
        gtk_widget_show(filtering.window);
 
@@ -289,6 +318,7 @@ static void prefs_filtering_create(void)
        GtkWidget *account_list;
        GtkWidget *account_combo;
        GtkWidget *dest_label;
+       GtkWidget *recip_label;
        GtkWidget *exec_label;
        GtkWidget *dest_entry;
        GtkWidget *dest_btn;
@@ -308,7 +338,6 @@ static void prefs_filtering_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
-       GtkWidget *dummy;
 
        GList *combo_items;
        gint i;
@@ -318,7 +347,7 @@ static void prefs_filtering_create(void)
 
        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);
@@ -337,15 +366,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",
@@ -362,7 +389,7 @@ 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);
 
@@ -378,7 +405,7 @@ static void prefs_filtering_create(void)
                            NULL);
 
        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);
 
@@ -393,12 +420,9 @@ static void prefs_filtering_create(void)
                               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]));
-       }
+       for (i = 0; i < sizeof action_text / sizeof action_text[0]; i++)
+               combo_items = g_list_append
+                       (combo_items, (gpointer) _(action_text[i].text));
        gtk_combo_set_popdown_strings(GTK_COMBO(action_combo), combo_items);
 
        g_list_free(combo_items);
@@ -417,7 +441,7 @@ static void prefs_filtering_create(void)
        /* accounts */
 
        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);
 
@@ -457,7 +481,7 @@ static void prefs_filtering_create(void)
        /* destination */
 
        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);
 
@@ -466,6 +490,11 @@ static void prefs_filtering_create(void)
        gtk_misc_set_alignment (GTK_MISC (dest_label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (hbox1), dest_label, FALSE, FALSE, 0);
 
+       recip_label = gtk_label_new (_("Recipient"));
+       gtk_widget_show (recip_label);
+       gtk_misc_set_alignment (GTK_MISC (recip_label), 0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox1), recip_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);
@@ -514,13 +543,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",
@@ -546,7 +575,7 @@ static void prefs_filtering_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
-       title[0] = _("Registered rules");
+       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);
@@ -584,11 +613,13 @@ static void prefs_filtering_create(void)
        filtering.cond_entry = cond_entry;
        filtering.action_list = action_list;
        filtering.action_combo = action_combo;
+       filtering.account_label = account_label;
        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.recip_label = recip_label;
        filtering.exec_label = exec_label;
        filtering.exec_btn = exec_btn;
 
@@ -604,16 +635,203 @@ 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;
+
+       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;
+               FilteringAction *action = filtering->action;
+
+               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, *orig;
+       GSList *next;
+       gchar *path = (gchar *)data;
+       gchar *suffix;
+       gint destlen;
+       gint prefixlen;
+       gint pathlen;
+       FolderItem *item;
+       
+       g_return_val_if_fail(path != NULL, FALSE);
+
+       pathlen = strlen(path);
+       if (node == NULL)
+               cur = global_processing;
+       else {
+               item = node->data;
+               if (!item || !item->prefs)
+                       return FALSE;
+               cur = item->prefs->processing;
+       }
+       orig = cur;
+       
+       for (; cur != NULL; cur = cur->next) {
+               FilteringProp *filtering = (FilteringProp *)cur->data;
+               FilteringAction *action;
+               if (!cur->data)
+                       break;
+               
+               action = filtering->action;
+               next = cur->next;
+
+               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);
+                               orig = g_slist_remove(orig, filtering);
+                       }
+               } else if (strcmp(action->destination, path) == 0) {
+                       filteringprop_free(filtering);
+                       orig = g_slist_remove(orig, filtering);
+
+               }
+       }
+
+       if (node == NULL)
+               global_processing = orig;
+       else {
+               item = node->data;
+               if (!item || !item->prefs)
+                       return FALSE;
+               item->prefs->processing = orig;
+       }
+
+       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;
@@ -623,13 +841,26 @@ static void prefs_filtering_set_dialog(void)
        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)
@@ -646,7 +877,6 @@ static void prefs_filtering_set_list(void)
        FilteringProp *prop;
        GSList * cur;
        gchar * filtering_str;
-       gchar * tmp;
        GSList * prefs_filtering;
 
        if (cur_item == NULL)
@@ -726,12 +956,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 = matcher_parser_get_cond(cond_str);
                if (matchers == NULL)
-                       alertpanel_error(_("Match string is not valid."));
+                       alertpanel_error(_("Condition string is not valid."));
        }
 
        prefs_matcher_open(matchers, prefs_filtering_condition_define_done);
@@ -744,23 +971,22 @@ static void prefs_filtering_condition_define(void)
 /* 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;
        FilteringProp * prop;
        FilteringAction * action;
-       gchar * tmp;
        gint list_id;
-       gint action_id;
+       Action action_id;
        gint action_type;
        gint account_id;
        gchar * destination;
-       gint labelcolor;
+       gint labelcolor = 0;
        
        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;
        }
 
@@ -772,13 +998,19 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
        switch (action_id) {
        case ACTION_MOVE:
        case ACTION_COPY:
+       case ACTION_EXECUTE:
+               destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
+               if (*destination == '\0') {
+                       if(alert == TRUE) alertpanel_error(_("Destination is not set."));
+                       return NULL;
+               }
+               break;
        case ACTION_FORWARD:
        case ACTION_FORWARD_AS_ATTACHMENT:
-       case ACTION_BOUNCE:
-       case ACTION_EXECUTE:
+       case ACTION_REDIRECT:
                destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
                if (*destination == '\0') {
-                       alertpanel_error(_("Destination is not set."));
+                       if(alert == TRUE) alertpanel_error(_("Recipient is not set."));
                        return NULL;
                }
                break;
@@ -787,9 +1019,6 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
                        gtk_option_menu_get_menu(GTK_OPTION_MENU(filtering.color_optmenu)));
                destination = NULL;     
                break;
-       case ACTION_DELETE_ON_SERVER:
-               destination = NULL;
-               break;
        default:
                destination = NULL;
                break;
@@ -800,7 +1029,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
        cond = matcher_parser_get_cond(cond_str);
 
        if (cond == NULL) {
-               alertpanel_error(_("Match string is not valid."));
+               if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
                filteringaction_free(action);
                return NULL;
        }
@@ -814,7 +1043,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);
@@ -835,7 +1064,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);
@@ -861,6 +1090,8 @@ static void prefs_filtering_delete_cb(void)
 
        gtk_clist_remove(clist, row);
 
+       prefs_filtering_reset_dialog();
+
        prefs_filtering_update_hscrollbar();
 }
 
@@ -896,10 +1127,10 @@ 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;
+       FilteringAction *action;
+       gchar *matcher_str;
        gint list_id;
 
        prefs_filtering_reset_dialog();
@@ -940,6 +1171,14 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_UNMARK);
                break;
+       case MATCHACTION_LOCK:
+               gtk_list_select_item(GTK_LIST(filtering.action_list),
+                                    ACTION_LOCK);
+               break;
+       case MATCHACTION_UNLOCK:
+               gtk_list_select_item(GTK_LIST(filtering.action_list),
+                                    ACTION_UNLOCK);
+               break;
        case MATCHACTION_MARK_AS_READ:
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_MARK_AS_READ);
@@ -962,10 +1201,10 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
-       case MATCHACTION_BOUNCE:
+       case MATCHACTION_REDIRECT:
                list_id = get_list_id_from_account_id(action->account_id);
                gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_BOUNCE);
+                                    ACTION_REDIRECT);
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
@@ -978,10 +1217,6 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                                     ACTION_COLOR);
                gtk_option_menu_set_history(GTK_OPTION_MENU(filtering.color_optmenu), action->labelcolor);     
                break;
-       case MATCHACTION_DELETE_ON_SERVER:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_DELETE_ON_SERVER);
-               break;
        }
 
        g_free(matcher_str);
@@ -991,7 +1226,6 @@ static void prefs_filtering_select(GtkCList *clist, gint row, gint column,
                                GdkEvent *event)
 {
        FilteringProp * prop;
-       gchar * tmp;
        gchar * filtering_str;
 
        if (row == 0) {
@@ -1035,11 +1269,13 @@ static void prefs_filtering_action_selection_changed(GtkList *list,
 
        if (filtering.current_action != value) {
                if (filtering.current_action == ACTION_FORWARD 
-               ||  filtering.current_action == ACTION_FORWARD_AS_ATTACHMENT) {
+               ||  filtering.current_action == ACTION_FORWARD_AS_ATTACHMENT
+               ||  filtering.current_action == ACTION_REDIRECT) {
                        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) {
+               if (value == ACTION_FORWARD || value == ACTION_FORWARD_AS_ATTACHMENT
+               ||  value == ACTION_REDIRECT) {
                        debug_print("registering address completion entry\n");
                        address_completion_register_entry(GTK_ENTRY(filtering.dest_entry));
                }
@@ -1051,127 +1287,137 @@ static void prefs_filtering_action_select(GtkList *list,
                                          GtkWidget *widget,
                                          gpointer user_data)
 {
-       gint value;
+       Action value;
 
-       value = get_sel_from_list(GTK_LIST(filtering.action_list));
+       value = (Action) get_sel_from_list(GTK_LIST(filtering.action_list));
 
        switch (value) {
        case ACTION_MOVE:
+               gtk_widget_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, FALSE);
                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_set_sensitive(filtering.dest_btn, TRUE);
                gtk_widget_show(filtering.dest_label);
+               gtk_widget_set_sensitive(filtering.dest_label, TRUE);
+               gtk_widget_hide(filtering.recip_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_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, FALSE);
                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_set_sensitive(filtering.dest_btn, TRUE);
                gtk_widget_show(filtering.dest_label);
+               gtk_widget_set_sensitive(filtering.dest_label, TRUE);
+               gtk_widget_hide(filtering.recip_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_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, FALSE);
                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_btn);
+               gtk_widget_set_sensitive(filtering.dest_btn, FALSE);
                gtk_widget_show(filtering.dest_label);
+               gtk_widget_set_sensitive(filtering.dest_label, FALSE);
+               gtk_widget_hide(filtering.recip_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_LOCK:
+       case ACTION_UNLOCK:
        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_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, FALSE);
                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_btn);
+               gtk_widget_set_sensitive(filtering.dest_btn, FALSE);
                gtk_widget_show(filtering.dest_label);
+               gtk_widget_set_sensitive(filtering.dest_label, FALSE);
+               gtk_widget_hide(filtering.recip_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_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, TRUE);
                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_show(filtering.dest_btn);
+               gtk_widget_set_sensitive(filtering.dest_btn, FALSE);
+               gtk_widget_hide(filtering.dest_label);
+               gtk_widget_show(filtering.recip_label);
+               gtk_widget_set_sensitive(filtering.recip_label, TRUE);
                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_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, TRUE);
                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_show(filtering.dest_btn);
+               gtk_widget_set_sensitive(filtering.dest_btn, FALSE);
+               gtk_widget_hide(filtering.dest_label);
+               gtk_widget_show(filtering.recip_label);
+               gtk_widget_set_sensitive(filtering.recip_label, TRUE);
                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_BOUNCE:
+       case ACTION_REDIRECT:
+               gtk_widget_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, TRUE);
                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_show(filtering.dest_btn);
+               gtk_widget_set_sensitive(filtering.dest_btn, FALSE);
+               gtk_widget_hide(filtering.dest_label);
+               gtk_widget_show(filtering.recip_label);
+               gtk_widget_set_sensitive(filtering.recip_label, TRUE);
                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_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, FALSE);
                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_hide(filtering.recip_label);
                gtk_widget_show(filtering.exec_label);
                gtk_widget_set_sensitive(filtering.exec_btn, TRUE);
                gtk_widget_show(filtering.exec_btn);
@@ -1179,27 +1425,19 @@ static void prefs_filtering_action_select(GtkList *list,
                gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_COLOR:
+               gtk_widget_show(filtering.account_label);
+               gtk_widget_set_sensitive(filtering.account_label, FALSE);
                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.recip_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;
-       case ACTION_DELETE_ON_SERVER:
-               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_hide(filtering.exec_btn);
-               gtk_widget_hide(filtering.color_optmenu);
-               gtk_widget_hide(filtering.color_label);
-               break;
        }
 }
 
@@ -1219,6 +1457,32 @@ 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_matcher_write_config();
        prefs_filtering_close();