2005-06-26 [paul] 1.9.11cvs104
[claws.git] / src / prefs_filtering.c
index 549737a4bf9d5451bff92feb78b63d78dda62661..c54a25b0dcc1ac455b528441c11f3e2b297002c9 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
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gdk/gdkkeysyms.h>
@@ -32,9 +33,8 @@
 #include <string.h>
 #include <errno.h>
 
-#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 "matcher_parser.h"
 #include "matcher.h"
+#include "prefs_filtering_action.h"
+
+enum {
+       PREFS_FILTERING_RULE,
+       PREFS_FILTERING_PROP,
+       N_PREFS_FILTERING_COLUMNS
+};
 
 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 *cond_clist;
-
-       /* need this to make address completion entry work */
-       gint current_action;
+       GtkWidget *action_entry;
+
+       GtkWidget *cond_list_view;
 } filtering;
 
+static GSList ** p_processing_list = NULL;
+
 /* widget creating functions */
 static void prefs_filtering_create             (void);
 
@@ -85,164 +80,57 @@ static void prefs_filtering_set_dialog     (const gchar *header,
 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_top                (void);
 static void prefs_filtering_up         (void);
-static void prefs_filtering_down               (void);
-static void prefs_filtering_select             (GtkCList       *clist,
-                                        gint            row,
-                                        gint            column,
-                                        GdkEvent       *event);
-
+static void prefs_filtering_down       (void);
+static void prefs_filtering_bottom     (void);
 static gint prefs_filtering_deleted    (GtkWidget      *widget,
                                         GdkEventAny    *event,
                                         gpointer        data);
-static void prefs_filtering_key_pressed        (GtkWidget      *widget,
+static gboolean 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_list_view_set_row  (gint row, FilteringProp * prop);
                                          
-static void prefs_filtering_reset_dialog(void);
+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;
+static void delete_path(GSList ** p_filters, const gchar * path);
 
-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_REDIRECT = 9,
-       ACTION_EXECUTE = 10,
-       ACTION_COLOR = 11,
-       ACTION_DELETE_ON_SERVER = 12,
-};
 
-static gint get_sel_from_list(GtkList * list)
-{
-       gint row = 0;
-       void * sel;
-       GList * child;
+static GtkListStore* prefs_filtering_create_data_store (void);
+static gint prefs_filtering_list_view_insert_rule      (GtkListStore *list_store,
+                                                        gint row,
+                                                        const gchar *rule, 
+                                                        gboolean prop);
+static gchar *prefs_filtering_list_view_get_rule       (GtkWidget *list, 
+                                                        gint row);
 
-       if (list->selection == NULL)
-               return -1;
+static GtkWidget *prefs_filtering_list_view_create     (void);
+static void prefs_filtering_create_list_view_columns   (GtkWidget *list_view);
+static gint prefs_filtering_get_selected_row           (GtkWidget *list_view);
+static gboolean prefs_filtering_list_view_select_row   (GtkWidget *list, gint row);
 
-       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)
-{
-       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 gboolean prefs_filtering_selected               (GtkTreeSelection *selector,
+                                                        GtkTreeModel *model, 
+                                                        GtkTreePath *path,
+                                                        gboolean currently_selected,
+                                                        gpointer data);
 
-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;
-}
-
-static gint prefs_filtering_get_matching_from_action(gint action_id)
-{
-       switch(action_id) {
-       case ACTION_MOVE:
-               return MATCHACTION_MOVE;
-       case ACTION_COPY:
-               return MATCHACTION_COPY;
-       case ACTION_DELETE:
-               return MATCHACTION_DELETE;
-       case ACTION_MARK:
-               return MATCHACTION_MARK;
-       case ACTION_UNMARK:
-               return MATCHACTION_UNMARK;
-       case ACTION_MARK_AS_READ:
-               return MATCHACTION_MARK_AS_READ;
-       case ACTION_MARK_AS_UNREAD:
-               return MATCHACTION_MARK_AS_UNREAD;
-       case ACTION_FORWARD:
-               return MATCHACTION_FORWARD;
-       case ACTION_FORWARD_AS_ATTACHMENT:
-               return MATCHACTION_FORWARD_AS_ATTACHMENT;
-       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_("Redirect"), 
-       N_("Execute"),
-       N_("Color"),
-       N_("Delete on Server")
-};
-
-void prefs_filtering_open(FolderItem * item,
+void prefs_filtering_open(GSList ** p_processing,
+                         const gchar * title,
                          const gchar *header,
                          const gchar *key)
 {
-       gchar *esckey;
-
        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
 
@@ -254,18 +142,31 @@ void prefs_filtering_open(FolderItem * item,
 
        manage_window_set_transient(GTK_WINDOW(filtering.window));
        gtk_widget_grab_focus(filtering.ok_btn);
-
-       cur_item = item;
-
-       esckey = matcher_escape_str(key);
-       prefs_filtering_set_dialog(header, esckey);
-       g_free(esckey);
+       
+       if (title != NULL)
+               gtk_window_set_title(GTK_WINDOW(filtering.window), title);
+       else
+               gtk_window_set_title (GTK_WINDOW(filtering.window),
+                                     _("Filtering/Processing configuration"));
+       
+        p_processing_list = p_processing;
+        
+       prefs_filtering_set_dialog(header, key);
 
        gtk_widget_show(filtering.window);
 
        start_address_completion();
 }
 
+static void prefs_filtering_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.filteringwin_width = allocation->width;
+       prefs_common.filteringwin_height = allocation->height;
+}
+
 /* prefs_filtering_close() - just to have one common exit point */
 static void prefs_filtering_close(void)
 {
@@ -293,18 +194,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;
@@ -312,35 +203,30 @@ static void prefs_filtering_create(void)
 
        GtkWidget *cond_hbox;
        GtkWidget *cond_scrolledwin;
-       GtkWidget *cond_clist;
+       GtkWidget *cond_list_view;
 
        GtkWidget *btn_vbox;
+       GtkWidget *spc_vbox;
+       GtkWidget *top_btn;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
-
-
-       GList *combo_items;
-       gint i;
-
-       GList *accounts;
-       GList * cur;
-
-       gchar *title[1];
+       GtkWidget *bottom_btn;
+       static GdkGeometry geometry;
 
        debug_print("Creating filtering configuration window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
+       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-       gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
+       gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
 
        vbox = gtk_vbox_new (FALSE, 6);
        gtk_widget_show (vbox);
        gtk_container_add (GTK_CONTAINER (window), vbox);
 
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+                                     &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
        gtk_widget_show (confirm_area);
        gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default (ok_btn);
@@ -348,15 +234,17 @@ static void prefs_filtering_create(void)
        gtk_window_set_title (GTK_WINDOW(window),
                                    _("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);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(prefs_filtering_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(prefs_filtering_size_allocate_cb), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(prefs_filtering_key_pressed), 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",
-                           GTK_SIGNAL_FUNC(prefs_filtering_cancel), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_ok), NULL);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_cancel), NULL);
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -369,7 +257,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);
 
@@ -380,131 +268,30 @@ static void prefs_filtering_create(void)
        cond_btn = gtk_button_new_with_label (_("Define ..."));
        gtk_widget_show (cond_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), cond_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (cond_btn), "clicked",
-                           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);
+       g_signal_connect(G_OBJECT (cond_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_condition_define),
+                        NULL);
 
        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_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 */
-
-       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);
-
-       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 */
+       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);
 
-       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);
+       action_entry = gtk_entry_new ();
+       gtk_widget_show (action_entry);
+       gtk_box_pack_start (GTK_BOX (hbox1), action_entry, TRUE, TRUE, 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_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_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),
-                           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);
+       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);
+       g_signal_connect(G_OBJECT (action_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_define),
+                        NULL);
 
        /* register / substitute / delete */
 
@@ -515,30 +302,30 @@ static void prefs_filtering_create(void)
        arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_widget_show (arrow);
        gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize (arrow, -1, 16);
+       gtk_widget_set_size_request (arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new (TRUE, 4);
        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 (_("Add"));
+       reg_btn = gtk_button_new_from_stock (GTK_STOCK_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);
+       g_signal_connect(G_OBJECT (reg_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_register_cb), NULL);
 
        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",
-                           GTK_SIGNAL_FUNC (prefs_filtering_substitute_cb),
-                           NULL);
+       g_signal_connect(G_OBJECT (subst_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_substitute_cb),
+                        NULL);
 
-       del_btn = gtk_button_new_with_label (_("Delete"));
+       del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_delete_cb), NULL);
+       g_signal_connect(G_OBJECT (del_btn), "clicked",
+                       G_CALLBACK(prefs_filtering_delete_cb), NULL);
 
        cond_hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (cond_hbox);
@@ -546,90 +333,95 @@ static void prefs_filtering_create(void)
 
        cond_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_show (cond_scrolledwin);
-       gtk_widget_set_usize (cond_scrolledwin, -1, 150);
+       gtk_widget_set_size_request (cond_scrolledwin, -1, 150);
        gtk_box_pack_start (GTK_BOX (cond_hbox), cond_scrolledwin,
                            TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cond_scrolledwin),
                                        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);
-       gtk_clist_set_column_width (GTK_CLIST (cond_clist), 0, 80);
-       gtk_clist_set_selection_mode (GTK_CLIST (cond_clist),
-                                     GTK_SELECTION_BROWSE);
-       GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (cond_clist)->column[0].button,
-                               GTK_CAN_FOCUS);
-       gtk_signal_connect (GTK_OBJECT (cond_clist), "select_row",
-                           GTK_SIGNAL_FUNC (prefs_filtering_select), NULL);
+       cond_list_view = prefs_filtering_list_view_create();    
+       gtk_widget_show (cond_list_view);
+       gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_list_view);
 
        btn_vbox = gtk_vbox_new (FALSE, 8);
        gtk_widget_show (btn_vbox);
        gtk_box_pack_start (GTK_BOX (cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
-       up_btn = gtk_button_new_with_label (_("Up"));
+       top_btn = gtk_button_new_from_stock (GTK_STOCK_GOTO_TOP);
+       gtk_widget_show (top_btn);
+       gtk_box_pack_start (GTK_BOX (btn_vbox), top_btn, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT (top_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_top), NULL);
+
+       PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
+
+       up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
        gtk_widget_show (up_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (up_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_up), NULL);
+       g_signal_connect(G_OBJECT (up_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_up), NULL);
 
-       down_btn = gtk_button_new_with_label (_("Down"));
+       down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
        gtk_widget_show (down_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_down), NULL);
+       g_signal_connect(G_OBJECT (down_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_down), NULL);
+
+       PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
+
+       bottom_btn = gtk_button_new_from_stock (GTK_STOCK_GOTO_BOTTOM);
+       gtk_widget_show (bottom_btn);
+       gtk_box_pack_start (GTK_BOX (btn_vbox), bottom_btn, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT (bottom_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_bottom), NULL);
+
+       if (!geometry.min_height) {
+               geometry.min_width = 500;
+               geometry.min_height = 400;
+       }
 
-       gtk_widget_set_usize(window, 500, -1);
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.filteringwin_width,
+                                   prefs_common.filteringwin_height);
 
        gtk_widget_show_all(window);
 
        filtering.window    = window;
        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.cond_clist   = cond_clist;
-
-       filtering.color_label   = color_label;
-       filtering.color_optmenu = color_optmenu;
+       filtering.cond_entry     = cond_entry;
+       filtering.action_entry   = action_entry;
+       filtering.cond_list_view = cond_list_view;
 }
 
-static void prefs_filtering_update_hscrollbar(void)
-{
-       gint optwidth = gtk_clist_optimal_column_width(GTK_CLIST(filtering.cond_clist), 0);
-       gtk_clist_set_column_width(GTK_CLIST(filtering.cond_clist), 0, optwidth);
-}
+static void rename_path(GSList * filters,
+                       const gchar * old_path, const gchar * new_path);
 
 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;
+       const gchar *paths[2] = {NULL, NULL};
+       paths[0] = old_path;
+       paths[1] = 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);
+        
+       rename_path(pre_global_processing, old_path, new_path);
+       rename_path(post_global_processing, old_path, new_path);
+       rename_path(filtering_rules, old_path, new_path);
+        
+       prefs_matcher_write_config();
 }
 
-static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
+static void rename_path(GSList * filters,
+                       const gchar * old_path, const gchar * new_path)
 {
-       GSList *cur;
-       gchar *old_path, *new_path;
        gchar *base;
        gchar *prefix;
        gchar *suffix;
@@ -638,80 +430,94 @@ static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
        gint destlen;
        gint prefixlen;
        gint oldpathlen;
-       FolderItem *item;
+        GSList * action_cur;
+        GSList * cur;
+
+       oldpathlen = strlen(old_path);
+       old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
+
+       for (cur = filters; 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;
+                                }
+                        }
+                }
+        }
+}
 
-       old_path = ((gchar **)data)[0];
-       new_path = ((gchar **)data)[1];
+static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
+{
+       GSList *filters;
+       const gchar * old_path;
+        const gchar * new_path;
+        const gchar ** paths;
+       FolderItem *item;
+        
+        paths = data;
+       old_path = paths[0];
+       new_path = paths[1];
 
        g_return_val_if_fail(old_path != NULL, FALSE);
        g_return_val_if_fail(new_path != NULL, FALSE);
+       g_return_val_if_fail(node != 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;
-       }
+        item = node->data;
+        if (!item || !item->prefs)
+                return FALSE;
+        filters = 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();
+        rename_path(filters, old_path, new_path);
 
        return FALSE;
 }
@@ -725,115 +531,121 @@ void prefs_filtering_delete_path(const gchar *path)
                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);
+        delete_path(&pre_global_processing, path);
+        delete_path(&post_global_processing, path);
+        delete_path(&filtering_rules, path);
+        
+       prefs_matcher_write_config();
 }
 
-static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
+static void delete_path(GSList ** p_filters, const gchar * path)
 {
-       GSList *cur, *orig;
-       GSList *next;
-       gchar *path = (gchar *)data;
+        GSList * filters;
+        GSList * duplist;
        gchar *suffix;
        gint destlen;
        gint prefixlen;
        gint pathlen;
+        GSList * action_cur;
+       GSList * cur;
+        
+       filters = *p_filters;
+       pathlen = strlen(path);
+       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);
+        
+        * p_filters = filters;
+}
+
+static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
+{
+       const gchar *path = data;
        FolderItem *item;
+        GSList ** p_filters;
        
        g_return_val_if_fail(path != NULL, FALSE);
+       g_return_val_if_fail(node != 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();
+        item = node->data;
+        if (!item || !item->prefs)
+                return FALSE;
+        p_filters = &item->prefs->processing;
+        
+        delete_path(p_filters, path);
 
        return FALSE;
 }
 
 static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
+       GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
        GSList *cur;
        GSList * prefs_filtering;
-       gchar *cond_str[1];
-       gint row;
+       gchar *cond_str;
+       GtkListStore *list_store;
        
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
+       list_store = GTK_LIST_STORE(gtk_tree_view_get_model(list_view));
+       gtk_list_store_clear(list_store);
 
-       cond_str[0] = _("(New)");
-       row = gtk_clist_append(clist, cond_str);
-       gtk_clist_set_row_data(clist, row, NULL);
+       /* add the place holder (New) at row 0 */
+       prefs_filtering_list_view_insert_rule(list_store, -1, 
+                                             _("(New)"),
+                                             FALSE);
 
-       if (cur_item == NULL)
-               prefs_filtering = global_processing;
-       else
-               prefs_filtering = cur_item->prefs->processing;
+        prefs_filtering = *p_processing_list;
 
        for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur)) {
                FilteringProp * prop = (FilteringProp *) cur->data;
 
-               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);
+               cond_str = filteringprop_to_string(prop);
+               subst_char(cond_str, '\t', ':');
 
-               g_free(cond_str[0]);
+               prefs_filtering_list_view_insert_rule(list_store, -1, 
+                                                     cond_str, TRUE);
+               
+               g_free(cond_str);
        }
 
-       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);
+               gchar * quoted_key;
+               gchar *match_str;
+
+               quoted_key = matcher_quote_str(key);
+               
+               match_str = g_strconcat(header, " ", get_matchparser_tab_str(MATCHTYPE_MATCHCASE),
+                                       " \"", quoted_key, "\"", NULL);
+               g_free(quoted_key);
+               
                gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), match_str);
                g_free(match_str);
        }
@@ -841,10 +653,8 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 
 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)
@@ -855,55 +665,45 @@ static void prefs_filtering_set_list(void)
        gchar * filtering_str;
        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))
+        prefs_filtering = *p_processing_list;
+       for (cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur))
                filteringprop_free((FilteringProp *) cur->data);
        g_slist_free(prefs_filtering);
        prefs_filtering = NULL;
+       
 
-       while (gtk_clist_get_text(GTK_CLIST(filtering.cond_clist),
-                                 row, 0, &filtering_str)) {
+       while (NULL != (filtering_str = prefs_filtering_list_view_get_rule
+                                               (filtering.cond_list_view, row))) {
+               /* FIXME: this strcmp() is bogus: "(New)" should never
+                * be inserted in the storage */
                if (strcmp(filtering_str, _("(New)")) != 0) {
-                       /* tmp = filtering_str; */
                        prop = matcher_parser_get_filtering(filtering_str);
-                       if (prop != NULL)
-                               prefs_filtering =
+                       g_free(filtering_str);
+                       if (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;
+       }                               
+       
+        *p_processing_list = prefs_filtering;
 }
 
-static gint prefs_filtering_clist_set_row(gint row, FilteringProp * prop)
+static gint prefs_filtering_list_view_set_row(gint row, FilteringProp * prop)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
-       gchar * str;
-       gchar *cond_str[1];
-
-       if (prop == NULL) {
-               cond_str[0] = _("(New)");
-               return gtk_clist_append(clist, cond_str);
-       }
+       GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
+       gchar *str;
+       GtkListStore *list_store;
 
        str = filteringprop_to_string(prop);
-       if (str == NULL) {
+       if (str == NULL)
                return -1;
-       }
-       cond_str[0] = str;
 
-       if (row < 0)
-               row = gtk_clist_append(clist, cond_str);
-       else
-               gtk_clist_set_text(clist, row, 0, cond_str[0]);
+       list_store = GTK_LIST_STORE(gtk_tree_view_get_model(list_view));
+
+       row = prefs_filtering_list_view_insert_rule(list_store, row, str, prop != NULL);
+
        g_free(str);
 
        return row;
@@ -929,13 +729,15 @@ static void prefs_filtering_condition_define(void)
        gchar * cond_str;
        MatcherList * matchers = NULL;
 
-       cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
+       cond_str = gtk_editable_get_chars(GTK_EDITABLE(filtering.cond_entry), 0, -1);
 
        if (*cond_str != '\0') {
                matchers = matcher_parser_get_cond(cond_str);
                if (matchers == NULL)
                        alertpanel_error(_("Condition string is not valid."));
        }
+       
+       g_free(cond_str);
 
        prefs_matcher_open(matchers, prefs_filtering_condition_define_done);
 
@@ -943,72 +745,91 @@ 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_editable_get_chars(GTK_EDITABLE(filtering.action_entry), 0, -1);
+
+       if (*action_str != '\0') {
+               action_list = matcher_parser_get_action_list(action_str);
+               if (action_list == NULL)
+                       alertpanel_error(_("Action string is not valid."));
+       }
+       
+       g_free(action_str);
+
+       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;
-       FilteringProp * prop;
-       FilteringAction * action;
-       gint list_id;
-       gint action_id;
-       gint action_type;
-       gint account_id;
-       gchar * destination;
-       gint labelcolor = 0;
-       
-       cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
-       if (*cond_str == '\0') {
-               alertpanel_error(_("Condition string is empty."));
-               return NULL;
-       }
+       gchar * cond_str = NULL;
+       gchar * action_str = NULL;
+       FilteringProp * prop = NULL;
+       GSList * action_list;
 
-       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_REDIRECT:
-       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;
-       case ACTION_DELETE_ON_SERVER:
-               destination = NULL;
-               break;
-       default:
-               destination = NULL;
-               break;
+       cond_str = gtk_editable_get_chars(GTK_EDITABLE(filtering.cond_entry), 0, -1);
+       if (*cond_str == '\0') {
+               if(alert == TRUE) alertpanel_error(_("Condition string is empty."));
+               goto fail;
        }
        
-       action = filteringaction_new(action_type, account_id, destination, labelcolor);
+       action_str = gtk_editable_get_chars(GTK_EDITABLE(filtering.action_entry), 0, -1);
+       if (*action_str == '\0') {
+               if(alert == TRUE) alertpanel_error(_("Action string is empty."));
+               goto fail;
+       }
 
        cond = matcher_parser_get_cond(cond_str);
 
        if (cond == NULL) {
-               alertpanel_error(_("Condition string is not valid."));
-               filteringaction_free(action);
-               return NULL;
+               if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
+               goto fail;
+       }
+        
+        action_list = matcher_parser_get_action_list(action_str);
+       
+
+       if (action_list == NULL) {
+               if(alert == TRUE) alertpanel_error(_("Action string is not valid."));
+               goto fail;
        }
 
-       prop = filteringprop_new(cond, action);
+       prop = filteringprop_new(cond, action_list);
 
+fail:
+       g_free(cond_str);
+       g_free(action_str);
        return prop;
 }
 
@@ -1016,417 +837,444 @@ 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);
-
-       filteringprop_free(prop);
+       prefs_filtering_list_view_set_row(-1, prop);
        
-       prefs_filtering_update_hscrollbar();
+       filteringprop_free(prop);
 }
 
 static void prefs_filtering_substitute_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
-       gint row;
-       FilteringProp * prop;
+       gint selected_row = prefs_filtering_get_selected_row
+               (filtering.cond_list_view);
+       FilteringProp *prop;
        
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0) return;
+       if (selected_row <= 0)
+               return;
 
-       prop = prefs_filtering_dialog_to_filtering();
-       if (prop == NULL)
+       prop = prefs_filtering_dialog_to_filtering(TRUE);
+       if (prop == NULL) 
                return;
-       prefs_filtering_clist_set_row(row, prop);
+       prefs_filtering_list_view_set_row(selected_row, prop);
 
        filteringprop_free(prop);
-       
-       prefs_filtering_update_hscrollbar();
 }
 
 static void prefs_filtering_delete_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
+       GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
+       GtkTreeModel *model;
+       GtkTreeIter iter;
        gint row;
-
-       if (!clist->selection) return;
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0) return;
+       
+       row = prefs_filtering_get_selected_row(filtering.cond_list_view);
+       if (row <= 0) 
+               return; 
 
        if (alertpanel(_("Delete rule"),
                       _("Do you really want to delete this rule?"),
                       _("Yes"), _("No"), NULL) == G_ALERTALTERNATE)
                return;
 
-       gtk_clist_remove(clist, row);
+       model = gtk_tree_view_get_model(list_view);     
+       if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
+               return;
+
+       gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 
-       prefs_filtering_update_hscrollbar();
+       prefs_filtering_reset_dialog();
+}
+
+static void prefs_filtering_top(void)
+{
+       gint row;
+       GtkTreeIter top, sel;
+       GtkTreeModel *model;
+
+       row = prefs_filtering_get_selected_row(filtering.cond_list_view);
+       if (row <= 1) 
+               return;
+
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));               
+       
+       if (!gtk_tree_model_iter_nth_child(model, &top, NULL, 0)
+       ||  !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
+               return;
+
+       gtk_list_store_move_after(GTK_LIST_STORE(model), &sel, &top);
+       prefs_filtering_list_view_select_row(filtering.cond_list_view, 1);
 }
 
 static void prefs_filtering_up(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
        gint row;
+       GtkTreeIter top, sel;
+       GtkTreeModel *model;
 
-       if (!clist->selection) return;
+       row = prefs_filtering_get_selected_row(filtering.cond_list_view);
+       if (row <= 1) 
+               return;
+               
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));       
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 1) {
-               gtk_clist_row_move(clist, row, row - 1);
-               if(gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL) {
-                       gtk_clist_moveto(clist, row - 1, 0, 0, 0);
-               } 
-       }
+       if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row - 1)
+       ||  !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
+               return;
+
+       gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
+       prefs_filtering_list_view_select_row(filtering.cond_list_view, row - 1);
 }
 
 static void prefs_filtering_down(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
-       gint row;
+       gint row, n_rows;
+       GtkTreeIter top, sel;
+       GtkTreeModel *model;
+
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));       
+       n_rows = gtk_tree_model_iter_n_children(model, NULL);
+       row = prefs_filtering_get_selected_row(filtering.cond_list_view);
+       if (row < 1 || row >= n_rows - 1)
+               return;
 
-       if (!clist->selection) return;
+       if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
+       ||  !gtk_tree_model_iter_nth_child(model, &sel, NULL, row + 1))
+               return;
+                       
+       gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
+       prefs_filtering_list_view_select_row(filtering.cond_list_view, row + 1);
+}
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 0 && row < clist->rows - 1) {
-               gtk_clist_row_move(clist, row, row + 1);
-               if(gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL) {
-                       gtk_clist_moveto(clist, row + 1, 0, 1, 0);
-               } 
-       }
+static void prefs_filtering_bottom(void)
+{
+       gint row, n_rows;
+       GtkTreeIter top, sel;
+       GtkTreeModel *model;
+
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));       
+       n_rows = gtk_tree_model_iter_n_children(model, NULL);
+       row = prefs_filtering_get_selected_row(filtering.cond_list_view);
+       if (row < 1 || row >= n_rows - 1)
+               return;
+
+       if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
+       ||  !gtk_tree_model_iter_nth_child(model, &sel, NULL, n_rows - 1))
+               return;
+
+       gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);           
+       prefs_filtering_list_view_select_row(filtering.cond_list_view, n_rows - 1);
 }
 
-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 MATCHACTION_MOVE:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MOVE);
-               break;
-       case MATCHACTION_COPY:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_COPY);
-               break;
-       case MATCHACTION_DELETE:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_DELETE);
-               break;
-       case MATCHACTION_MARK:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MARK);
-               break;
-       case MATCHACTION_UNMARK:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_UNMARK);
-               break;
-       case MATCHACTION_MARK_AS_READ:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MARK_AS_READ);
-               break;
-       case MATCHACTION_MARK_AS_UNREAD:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_MARK_AS_UNREAD);
-               break;
-       case MATCHACTION_FORWARD:
-               list_id = get_list_id_from_account_id(action->account_id);
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_FORWARD);
-               gtk_list_select_item(GTK_LIST(filtering.account_list),
-                                    list_id);
-               break;
-       case MATCHACTION_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 MATCHACTION_REDIRECT:
-               list_id = get_list_id_from_account_id(action->account_id);
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_REDIRECT);
-               gtk_list_select_item(GTK_LIST(filtering.account_list),
-                                    list_id);
-               break;
-       case MATCHACTION_EXECUTE:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_EXECUTE);
-               break;
-       case MATCHACTION_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;
-       case MATCHACTION_DELETE_ON_SERVER:
-               gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_DELETE_ON_SERVER);
-               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);
 }
 
-static void prefs_filtering_select(GtkCList *clist, gint row, gint column,
-                               GdkEvent *event)
+static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
+                                gpointer data)
 {
-       FilteringProp * prop;
-       gchar * filtering_str;
+       prefs_filtering_cancel();
+       return TRUE;
+}
 
-       if (row == 0) {
-               prefs_filtering_reset_dialog();
-               return;
+static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                    gpointer data)
+{
+       if (event && event->keyval == GDK_Escape) {
+               prefs_filtering_cancel();
+               return TRUE;                    
        }
+       return FALSE;
+}
 
-        if (!gtk_clist_get_text(GTK_CLIST(filtering.cond_clist),
-                               row, 0, &filtering_str))
-               return;
+static void prefs_filtering_ok(void)
+{
+       FilteringProp * prop;
+       gchar * str;
+       gchar * filtering_str;
+       gint row = 1;
+        AlertValue val;
        
-       prop = matcher_parser_get_filtering(filtering_str);
-       if (prop == NULL)
-               return;
+       prop = prefs_filtering_dialog_to_filtering(FALSE);
+       if (prop != NULL) {
+               str = filteringprop_to_string(prop);
+
+               while (NULL != (filtering_str = (prefs_filtering_list_view_get_rule
+                                                       (filtering.cond_list_view,
+                                                        row)))) {
+                       if (strcmp(filtering_str, str) == 0)
+                               break;
+                       row++;
+                       g_free(filtering_str);
+               }       
+
+               if (!filtering_str) {
+                       val = alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                _("Yes"), _("No"), NULL);
+                       if (G_ALERTDEFAULT != val) {
+                               g_free(filtering_str);
+                               g_free(str); /* fixed two leaks: huzzah! */
+                               filteringprop_free(prop);
+                               return;
+                       }
+               }               
 
-       prefs_filtering_select_set(prop);
+               g_free(filtering_str);
+               g_free(str);
+               filteringprop_free(prop); /* fixed a leak: huzzah! */
+       }
+       prefs_filtering_set_list();
+       prefs_matcher_write_config();
+       prefs_filtering_close();
+}
 
-       filteringprop_free(prop);
+static void prefs_filtering_cancel(void)
+{
+       prefs_matcher_read_config();
+       prefs_filtering_close();
 }
 
-static void prefs_filtering_select_dest(void)
+static GtkListStore* prefs_filtering_create_data_store(void)
+{
+       return gtk_list_store_new(N_PREFS_FILTERING_COLUMNS,
+                                 G_TYPE_STRING,
+                                 G_TYPE_BOOLEAN,
+                                -1);
+}
+
+/*!
+ *\brief       Insert filtering rule into store. Note that we access the
+ *             tree view / store by index, which is a bit suboptimal, but
+ *             at least it made GTK 2 porting easier.
+ *
+ *\param       list_store Store to operate on
+ *\param       row -1 to add a new rule to store, else change an existing
+ *             row
+ *\param       rule String representation of rule
+ *\param       prop TRUE if valid filtering rule; if FALSE it's the first
+ *             entry in the store ("(New)").
+ *
+ *\return      int Row of inserted / changed rule.
+ */
+static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
+                                                 gint row,
+                                                 const gchar *rule,
+                                                 gboolean prop) 
 {
-       FolderItem *dest;
-       gchar * path;
+       GtkTreeIter iter;
 
-       dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
-       if (!dest) return;
+       /* check if valid row at all */
+       if (row >= 0) {
+               if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(list_store),
+                                                  &iter, NULL, row))
+                       row = -1;                                                  
+       }
 
-       path = folder_item_get_identifier(dest);
+       if (row < 0) {
+               /* append new */
+               gtk_list_store_append(list_store, &iter);
+               gtk_list_store_set(list_store, &iter, 
+                                  PREFS_FILTERING_RULE, rule,
+                                  PREFS_FILTERING_PROP, prop,
+                                  -1);
+               return gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list_store),
+                                                     NULL) - 1;
+       } else {
+               /* change existing */
+               gtk_list_store_set(list_store, &iter, 
+                                  PREFS_FILTERING_RULE, rule,
+                                  -1);
+               return row;                                
+       }
+}
 
-       gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), path);
-       g_free(path);
+/*!
+ *\return      gchar * Rule at specified row - should be freed.
+ */
+static gchar *prefs_filtering_list_view_get_rule(GtkWidget *list, gint row)
+{      
+       GtkTreeView *list_view = GTK_TREE_VIEW(list);
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       GtkTreeIter iter;
+       gchar *result;
+
+       if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
+               return NULL;
+       
+       gtk_tree_model_get(model, &iter, 
+                          PREFS_FILTERING_RULE, &result,
+                          -1);
+       
+       return result;
 }
 
-static void prefs_filtering_action_selection_changed(GtkList *list,
-                                                    gpointer user_data)
+/*!
+ *\brief       Create list view for filtering
+ */
+static GtkWidget *prefs_filtering_list_view_create(void)
 {
-       gint value;
+       GtkTreeView *list_view;
+       GtkTreeSelection *selector;
+
+       list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL
+               (prefs_filtering_create_data_store())));
+       
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
+       
+       selector = gtk_tree_view_get_selection(list_view);
+       gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+       gtk_tree_selection_set_select_function(selector, prefs_filtering_selected,
+                                              NULL, NULL);
 
-       value = get_sel_from_list(GTK_LIST(filtering.action_list));
+       /* create the columns */
+       prefs_filtering_create_list_view_columns(GTK_WIDGET(list_view));
 
-       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;
-       }
+       return GTK_WIDGET(list_view);
 }
 
-static void prefs_filtering_action_select(GtkList *list,
-                                         GtkWidget *widget,
-                                         gpointer user_data)
+static void prefs_filtering_create_list_view_columns(GtkWidget *list_view)
 {
-       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_REDIRECT:
-               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, TRUE);
-               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;
-       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;
-       }
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Current filtering/processing rules"),
+                renderer,
+                "text", PREFS_FILTERING_RULE,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
 }
 
-static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
-                                gpointer data)
+static gboolean gtkut_tree_iter_comp(GtkTreeModel *model, 
+                                    GtkTreeIter *iter1, 
+                                    GtkTreeIter *iter2)
 {
-       prefs_filtering_cancel();
-       return TRUE;
+       GtkTreePath *path1 = gtk_tree_model_get_path(model, iter1);
+       GtkTreePath *path2 = gtk_tree_model_get_path(model, iter2);
+       gboolean result;
+
+       result = gtk_tree_path_compare(path1, path2) == 0;
+
+       gtk_tree_path_free(path1);
+       gtk_tree_path_free(path2);
+       
+       return result;
 }
 
-static void prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                    gpointer data)
+/*!
+ *\brief       Get selected row number.
+ */
+static gint prefs_filtering_get_selected_row(GtkWidget *list_view)
 {
-       if (event && event->keyval == GDK_Escape)
-               prefs_filtering_cancel();
+       GtkTreeView *view = GTK_TREE_VIEW(list_view);
+       GtkTreeModel *model = gtk_tree_view_get_model(view);
+       int n_rows = gtk_tree_model_iter_n_children(model, NULL);
+       GtkTreeSelection *selection;
+       GtkTreeIter iter;
+       int row;
+
+       if (n_rows == 0) 
+               return -1;
+       
+       selection = gtk_tree_view_get_selection(view);
+       if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+               return -1;
+       
+       /* get all iterators and compare them... */
+       for (row = 0; row < n_rows; row++) {
+               GtkTreeIter itern;
+
+               gtk_tree_model_iter_nth_child(model, &itern, NULL, row);
+               if (gtkut_tree_iter_comp(model, &iter, &itern))
+                       return row;
+       }
+       
+       return -1;
 }
 
-static void prefs_filtering_ok(void)
+static gboolean prefs_filtering_list_view_select_row(GtkWidget *list, gint row)
 {
-       prefs_filtering_set_list();
-       prefs_matcher_write_config();
-       prefs_filtering_close();
+       GtkTreeView *list_view = GTK_TREE_VIEW(list);
+       GtkTreeSelection *selection = gtk_tree_view_get_selection(list_view);
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       GtkTreeIter iter;
+       GtkTreePath *path;
+
+       if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
+               return FALSE;
+       
+       gtk_tree_selection_select_iter(selection, &iter);
+
+       path = gtk_tree_model_get_path(model, &iter);
+       gtk_tree_view_set_cursor(list_view, path, NULL, FALSE);
+       gtk_tree_path_free(path);
+       
+       return TRUE;
 }
 
-static void prefs_filtering_cancel(void)
+/*!
+ *\brief       Triggered when a row is selected
+ */
+static gboolean prefs_filtering_selected(GtkTreeSelection *selector,
+                                        GtkTreeModel *model, 
+                                        GtkTreePath *path,
+                                        gboolean currently_selected,
+                                        gpointer data)
 {
-       prefs_matcher_read_config();
-       prefs_filtering_close();
+       if (currently_selected)
+               return TRUE;
+       else {          
+               gboolean has_prop  = FALSE;
+               GtkTreeIter iter;
+
+               gtk_tree_model_get_iter(model, &iter, path);
+               gtk_tree_model_get(model, &iter,
+                                  PREFS_FILTERING_PROP, &has_prop,
+                                  -1);
+
+               if (has_prop) {
+                       FilteringProp *prop;
+                       gchar *filtering_str = NULL;
+                       
+                       gtk_tree_model_get(model, &iter,
+                                          PREFS_FILTERING_RULE, &filtering_str,
+                                          -1);
+
+                       prop = matcher_parser_get_filtering(filtering_str);
+                       if (prop) { 
+                               prefs_filtering_select_set(prop);
+                               filteringprop_free(prop);
+                       }                               
+                       
+                       g_free(filtering_str);
+               } else
+                       prefs_filtering_reset_dialog();
+       }               
+
+       return TRUE;
 }
+