2007-10-05 [paul] 3.0.2cvs13
[claws.git] / src / prefs_filtering.c
index ebb3d7a9fb674b79fe22fb3f073fcbc6dd5a062d..039d3eb1f9ee9a79ed201723cbe3878fa5f68708 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -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,7 +33,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_matcher.h"
 #include "folder.h"
 #include "filtering.h"
 #include "addr_compl.h"
-#include "colorlabel.h"
+#include "manual.h"
+#include "combobox.h"
 
 #include "matcher_parser.h"
 #include "matcher.h"
 #include "prefs_filtering_action.h"
 
-static struct Filtering {
+enum {
+       PREFS_FILTERING_ENABLED,
+       PREFS_FILTERING_NAME,
+       PREFS_FILTERING_ACCOUNT_ID,
+       PREFS_FILTERING_ACCOUNT_NAME,
+       PREFS_FILTERING_RULE,
+       PREFS_FILTERING_PROP,
+       N_PREFS_FILTERING_COLUMNS
+};
+
+struct _Filtering {
        GtkWidget *window;
 
+       GtkWidget *help_btn;
        GtkWidget *ok_btn;
+       GtkWidget *name_entry;
+       GtkWidget *account_label;
+       GtkWidget *account_combobox;
+       GtkListStore *account_combobox_list;
        GtkWidget *cond_entry;
        GtkWidget *action_entry;
 
-       GtkWidget *cond_clist;
-} filtering;
+       GtkWidget *cond_list_view;
+
+       GtkTreeViewColumn *account_name_column;
+};
+
+typedef struct _Filtering Filtering;
+
+static Filtering  filtering;
 
 static GSList ** p_processing_list = NULL;
 
@@ -81,11 +103,6 @@ static void prefs_filtering_top             (void);
 static void prefs_filtering_up         (void);
 static void prefs_filtering_down       (void);
 static void prefs_filtering_bottom     (void);
-static void prefs_filtering_select     (GtkCList       *clist,
-                                        gint            row,
-                                        gint            column,
-                                        GdkEvent       *event);
-
 static gint prefs_filtering_deleted    (GtkWidget      *widget,
                                         GdkEventAny    *event,
                                         gpointer        data);
@@ -97,18 +114,54 @@ static void prefs_filtering_ok             (void);
 
 static void prefs_filtering_condition_define   (void);
 static void prefs_filtering_action_define(void);
-static gint prefs_filtering_clist_set_row      (gint row, FilteringProp * prop);
+static gint prefs_filtering_list_view_set_row  (gint row, FilteringProp * prop);
                                          
 static void prefs_filtering_reset_dialog       (void);
+static gboolean prefs_filtering_rename_tag_func(GNode *node, gpointer data);
 static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data);
 static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data);
 
 static void delete_path(GSList ** p_filters, const gchar * path);
 
+
+static GtkListStore* prefs_filtering_create_data_store (void);
+static gint prefs_filtering_list_view_insert_rule      (GtkListStore *list_store,
+                                                        gint row,
+                                                        gboolean enabled,
+                                                        const gchar *name,
+                                                        gint account_id,
+                                                        const gchar *account_name,
+                                                        const gchar *rule, 
+                                                        gboolean prop);
+static gchar *prefs_filtering_list_view_get_rule       (GtkWidget *list, 
+                                                        gint row);
+static void prefs_filtering_list_view_get_rule_info    (GtkWidget *list, 
+                                                        gint row,
+                                                        gboolean *enabled,
+                                                        gchar **name,
+                                                        gint *account_id);
+
+static GtkWidget *prefs_filtering_list_view_create     (void);
+static void prefs_filtering_create_list_view_columns   (GtkWidget *list_view);
+
+static gboolean prefs_filtering_selected               (GtkTreeSelection *selector,
+                                                        GtkTreeModel *model, 
+                                                        GtkTreePath *path,
+                                                        gboolean currently_selected,
+                                                        gpointer data);
+
+static void prefs_filtering_account_option_menu_populate(void);
+
+static gulong signal_id = 0; /* filtering.help_btn clicked signal */
+
+static int modified = FALSE;
+
 void prefs_filtering_open(GSList ** p_processing,
-                         const gchar * title,
+                         const gchar *title,
+                         const gchar *help_url_anchor,
                          const gchar *header,
-                         const gchar *key)
+                         const gchar *key,
+                         gboolean per_account_filtering)
 {
        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
@@ -117,8 +170,14 @@ void prefs_filtering_open(GSList ** p_processing,
 
        if (!filtering.window) {
                prefs_filtering_create();
+       } else {
+               gtk_list_store_clear(filtering.account_combobox_list);
+               prefs_filtering_account_option_menu_populate();
        }
 
+       gtk_tree_view_column_set_visible(filtering.account_name_column,
+                                                                        per_account_filtering);
+
        manage_window_set_transient(GTK_WINDOW(filtering.window));
        gtk_widget_grab_focus(filtering.ok_btn);
        
@@ -127,14 +186,47 @@ void prefs_filtering_open(GSList ** p_processing,
        else
                gtk_window_set_title (GTK_WINDOW(filtering.window),
                                      _("Filtering/Processing configuration"));
-       
+
+       if (help_url_anchor != NULL) {
+               if (signal_id != 0) {
+                       g_signal_handler_disconnect(
+                                       G_OBJECT(filtering.help_btn),
+                                       signal_id);
+               }
+
+               signal_id = g_signal_connect(G_OBJECT(filtering.help_btn),
+                               "clicked",
+                               G_CALLBACK(manual_open_with_anchor_cb),
+                               (gchar*)help_url_anchor);
+       }
+       else {
+               gtk_widget_set_sensitive(filtering.help_btn, FALSE);
+       }
+
         p_processing_list = p_processing;
         
        prefs_filtering_set_dialog(header, key);
+       if (per_account_filtering) {
+               gtk_widget_show(filtering.account_label);
+               gtk_widget_show(filtering.account_combobox);
+       } else {
+               gtk_widget_hide(filtering.account_label);
+               gtk_widget_hide(filtering.account_combobox);
+               combobox_select_by_data(GTK_COMBO_BOX(filtering.account_combobox), 0);
+       }
 
        gtk_widget_show(filtering.window);
 
-       start_address_completion();
+       start_address_completion(NULL);
+}
+
+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 */
@@ -146,20 +238,59 @@ static void prefs_filtering_close(void)
        inc_unlock();
 }
 
+static void prefs_filtering_account_option_menu_populate(void)
+{
+       GList *accounts = NULL;
+       GtkTreeIter iter;
+
+       accounts = account_get_list();
+
+       g_return_if_fail(accounts != NULL);
+
+       COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
+       for (; accounts != NULL; accounts = accounts->next) {
+               PrefsAccount *ac = (PrefsAccount *)accounts->data;
+
+               COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id);
+       }
+}
+
+static GtkWidget *prefs_filtering_account_option_menu(Filtering *filtering)
+{
+       GtkWidget *optmenu = NULL;
+       GtkWidget *optmenubox = NULL;
+       GtkListStore *menu = NULL;
+       
+       optmenubox = gtk_event_box_new();
+       optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
+
+       filtering->account_combobox = optmenu;
+       filtering->account_combobox_list = menu;
+
+       prefs_filtering_account_option_menu_populate();
+
+       return optmenubox;
+}
+
 static void prefs_filtering_create(void)
 {
        GtkWidget *window;
        GtkWidget *vbox;
-       GtkWidget *ok_btn;
+       GtkWidget *help_btn;
        GtkWidget *cancel_btn;
+       GtkWidget *ok_btn;
        GtkWidget *confirm_area;
 
        GtkWidget *vbox1;
-       GtkWidget *hbox1;
        GtkWidget *reg_hbox;
        GtkWidget *arrow;
        GtkWidget *btn_hbox;
 
+       GtkWidget *name_label;
+       GtkWidget *name_entry;
+       GtkWidget *account_label;
+       GtkWidget *account_opt_menu;
        GtkWidget *cond_label;
        GtkWidget *cond_entry;
        GtkWidget *cond_btn;
@@ -173,7 +304,7 @@ 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;
@@ -181,23 +312,25 @@ static void prefs_filtering_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
        GtkWidget *bottom_btn;
-
-       gchar *title[1];
+       GtkWidget *table;
+       static GdkGeometry geometry;
 
        debug_print("Creating filtering configuration window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_filtering");
        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_with_help(&confirm_area, &help_btn,
+                       &cancel_btn, GTK_STOCK_CANCEL,
+                       &ok_btn, GTK_STOCK_OK,
+                       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);
@@ -205,65 +338,101 @@ 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);
-       gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox), vbox1, FALSE, TRUE, 0);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
 
+       table = gtk_table_new(4, 3, FALSE);
+       gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+       gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+       gtk_widget_show(table);
+       gtk_box_pack_start (GTK_BOX (vbox1), table, TRUE, TRUE, 0);
+
+       name_label = gtk_label_new (_("Name"));
+       gtk_widget_show (name_label);
+       gtk_misc_set_alignment (GTK_MISC (name_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), name_label, 0, 1, 0, 1,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       name_entry = gtk_entry_new ();
+       gtk_widget_show (name_entry);
+       gtk_table_attach (GTK_TABLE (table), name_entry, 1, 2, 0, 1,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       account_label = gtk_label_new (_("Account"));
+       gtk_widget_show (account_label);
+       gtk_misc_set_alignment (GTK_MISC (account_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), account_label, 0, 1, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       account_opt_menu = prefs_filtering_account_option_menu(&filtering);
+       gtk_widget_show (account_opt_menu);
+       gtk_table_attach (GTK_TABLE (table), account_opt_menu, 1, 2, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
+       combobox_select_by_data(GTK_COMBO_BOX(filtering.account_combobox), 0);
+
        cond_label = gtk_label_new (_("Condition"));
        gtk_widget_show (cond_label);
-       gtk_misc_set_alignment (GTK_MISC (cond_label), 0, 0.5);
-       gtk_box_pack_start (GTK_BOX (vbox1), cond_label, FALSE, FALSE, 0);
-
-       hbox1 = gtk_hbox_new (FALSE, VSPACING);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+       gtk_misc_set_alignment (GTK_MISC (cond_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), cond_label, 0, 1, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
 
        cond_entry = gtk_entry_new ();
        gtk_widget_show (cond_entry);
-       gtk_box_pack_start (GTK_BOX (hbox1), cond_entry, TRUE, TRUE, 0);
+       gtk_table_attach (GTK_TABLE (table), cond_entry, 1, 2, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
 
-       cond_btn = gtk_button_new_with_label (_("Define ..."));
+       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);
+       gtk_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 2, 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 (vbox1), action_label, FALSE, FALSE, 0);
-
-       hbox1 = gtk_hbox_new (FALSE, VSPACING);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+       gtk_misc_set_alignment (GTK_MISC (action_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), action_label, 0, 1, 3, 4,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
 
        action_entry = gtk_entry_new ();
        gtk_widget_show (action_entry);
-       gtk_box_pack_start (GTK_BOX (hbox1), action_entry, TRUE, TRUE, 0);
+       gtk_table_attach (GTK_TABLE (table), action_entry, 1, 2, 3, 4,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
 
-       action_btn = gtk_button_new_with_label (_("Define ..."));
+       action_btn = gtk_button_new_with_label (_(" Define... "));
        gtk_widget_show (action_btn);
-       gtk_box_pack_start (GTK_BOX (hbox1), action_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (action_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_action_define),
-                           NULL);
-
+       gtk_table_attach (GTK_TABLE (table), action_btn, 2, 3, 3, 4,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 2, 2);
+       g_signal_connect(G_OBJECT (action_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_define),
+                        NULL);
+                        
        /* register / substitute / delete */
-
        reg_hbox = gtk_hbox_new (FALSE, 4);
        gtk_widget_show (reg_hbox);
        gtk_box_pack_start (GTK_BOX (vbox1), reg_hbox, FALSE, FALSE, 0);
@@ -271,106 +440,127 @@ 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  "));
+       subst_btn = gtkut_get_replace_btn (_("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);
-       gtk_box_pack_start (GTK_BOX (vbox1), cond_hbox, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox), cond_hbox, TRUE, TRUE, 0);
 
        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);
 
-       top_btn = gtk_button_new_with_label (_("Top"));
+       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);
-       gtk_signal_connect (GTK_OBJECT (top_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_top), NULL);
+       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_with_label (_("Up"));
+       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_with_label (_("Bottom"));
+       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);
-       gtk_signal_connect (GTK_OBJECT (bottom_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_bottom), NULL);
+       g_signal_connect(G_OBJECT (bottom_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_bottom), NULL);
 
-       gtk_widget_set_usize(window, 500, -1);
+       if (!geometry.min_height) {
+               geometry.min_width = 500;
+               geometry.min_height = 400;
+       }
+
+       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.help_btn = help_btn;
        filtering.ok_btn = ok_btn;
 
-       filtering.cond_entry = cond_entry;
-       filtering.action_entry = action_entry;
-       filtering.cond_clist   = cond_clist;
+       filtering.name_entry     = name_entry;
+       filtering.cond_entry     = cond_entry;
+       filtering.action_entry   = action_entry;
+       filtering.cond_list_view = cond_list_view;
+       filtering.account_label  = account_label;
 }
 
-static void prefs_filtering_update_hscrollbar(void)
+static void rename_tag(GSList * filters,
+                       const gchar * old_tag, const gchar * new_tag);
+
+void prefs_filtering_rename_tag(const gchar *old_tag, const gchar *new_tag)
 {
-       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);
+       GList * cur;
+       const gchar *tags[2] = {NULL, NULL};
+       tags[0] = old_tag;
+       tags[1] = new_tag;
+       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_tag_func, tags);
+       }
+        
+       rename_tag(pre_global_processing, old_tag, new_tag);
+       rename_tag(post_global_processing, old_tag, new_tag);
+       rename_tag(filtering_rules, old_tag, new_tag);
+        
+       prefs_matcher_write_config();
 }
 
+
 static void rename_path(GSList * filters,
                        const gchar * old_path, const gchar * new_path);
 
@@ -419,7 +609,11 @@ static void rename_path(GSList * filters,
 
                         FilteringAction *action = action_cur->data;
                         
-                        if (!action->destination) continue;
+                        if (action->type == MATCHACTION_SET_TAG ||
+                           action->type == MATCHACTION_UNSET_TAG)
+                               continue;
+                        if (!action->destination) 
+                               continue;
                         
                         destlen = strlen(action->destination);
                         
@@ -497,6 +691,59 @@ static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
        return FALSE;
 }
 
+static void rename_tag(GSList * filters,
+                       const gchar * old_tag, const gchar * new_tag)
+{
+        GSList * action_cur;
+        GSList * cur;
+
+       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->type != MATCHACTION_SET_TAG &&
+                           action->type != MATCHACTION_UNSET_TAG)
+                               continue;
+                        if (!action->destination)
+                               continue;
+                        if (!strcmp(action->destination, old_tag)) {
+                               g_free(action->destination);
+                               action->destination = g_strdup(new_tag);
+                       }
+                }
+        }
+}
+
+static gboolean prefs_filtering_rename_tag_func(GNode *node, gpointer data)
+{
+       GSList *filters;
+       const gchar * old_tag;
+        const gchar * new_tag;
+        const gchar ** tags;
+       FolderItem *item;
+        
+        tags = data;
+       old_tag = tags[0];
+       new_tag = tags[1];
+
+       g_return_val_if_fail(old_tag != NULL, FALSE);
+       g_return_val_if_fail(new_tag != NULL, FALSE);
+       g_return_val_if_fail(node != NULL, FALSE);
+
+        item = node->data;
+        if (!item || !item->prefs)
+                return FALSE;
+        filters = item->prefs->processing;
+
+        rename_tag(filters, old_tag, new_tag);
+
+       return FALSE;
+}
+
 void prefs_filtering_delete_path(const gchar *path)
 {
        GList * cur;
@@ -537,7 +784,11 @@ static void delete_path(GSList ** p_filters, const gchar * path)
                         
                         action = action_cur->data;
                         
-                        if (!action->destination) continue;
+                        if (action->type == MATCHACTION_SET_TAG ||
+                           action->type == MATCHACTION_UNSET_TAG)
+                               continue;
+                        if (!action->destination) 
+                               continue;
                         
                         destlen = strlen(action->destination);
                         
@@ -581,35 +832,52 @@ static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
 
 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, 
+                                             FALSE,
+                                             _("(New)"),
+                                                 0,
+                                             _("(New)"),
+                                             _("(New)"),
+                                             FALSE);
 
-        prefs_filtering = * p_processing_list;
+        prefs_filtering = *p_processing_list;
 
        for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur)) {
                FilteringProp * prop = (FilteringProp *) cur->data;
+               gchar *account_name = NULL;
 
-               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);
+               if (prop->account_id > 0) {
+                       PrefsAccount *ac_prefs = account_find_from_id(prop->account_id);
 
-               g_free(cond_str[0]);
+                       if (ac_prefs)
+                               account_name = ac_prefs->account_name;
+               }
+               if (account_name == NULL)
+                       account_name = (gchar *)Q_("Filtering Account Menu|All");
+
+               cond_str = filteringprop_to_string(prop);
+               subst_char(cond_str, '\t', ':');
+
+               prefs_filtering_list_view_insert_rule(list_store, -1, 
+                                                     prop->enabled,
+                                                     prop->name,
+                                                         prop->account_id,
+                                                         account_name,
+                                                     cond_str, TRUE);
+               
+               g_free(cond_str);
        }
 
-       prefs_filtering_update_hscrollbar();
-       gtk_clist_thaw(clist);
-
        prefs_filtering_reset_dialog();
 
        if (header && key) {
@@ -629,6 +897,8 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 
 static void prefs_filtering_reset_dialog(void)
 {
+       gtk_entry_set_text(GTK_ENTRY(filtering.name_entry), "");
+       combobox_select_by_data(GTK_COMBO_BOX(filtering.account_combobox), 0);
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), "");
        gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), "");
 }
@@ -641,48 +911,75 @@ static void prefs_filtering_set_list(void)
        gchar * filtering_str;
        GSList * prefs_filtering;
 
-        prefs_filtering = * p_processing_list;
-
-       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) {
+                       gboolean enabled;
+                       gchar *name;
+                       gint account_id = 0;
+
+                       prefs_filtering_list_view_get_rule_info(
+                                       filtering.cond_list_view, row,
+                                       &enabled, &name, &account_id);
                        prop = matcher_parser_get_filtering(filtering_str);
-                       if (prop != NULL)
-                               prefs_filtering =
+                       g_free(filtering_str);
+                       if (prop) {
+                               prop->enabled = enabled;
+                               prop->name = name;
+                               prop->account_id = account_id;
+                               prefs_filtering = 
                                        g_slist_append(prefs_filtering, prop);
+                       }
                }
+               
                row++;
-       }
-
-        * p_processing_list = 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;
+       gchar *name = NULL;
+       gint account_id = 0;
+       gchar *account_name = (gchar *)Q_("Filtering Account Menu|All");
+       gboolean enabled = TRUE;
 
        str = filteringprop_to_string(prop);
-       if (str == NULL) {
+       if (str == NULL)
                return -1;
+
+       if (prop) {
+               if (prop->name)
+                       name = prop->name;
+               account_id = prop->account_id;
+               if (account_id > 0)
+                       account_name = account_find_from_id(account_id)->account_name;
+               enabled = prop->enabled;
        }
-       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,
+                                                   enabled,
+                                                   name,
+                                                   account_id,
+                                                       account_name,
+                                                   str,
+                                                   prop != NULL);
+
        g_free(str);
 
        return row;
@@ -705,16 +1002,18 @@ static void prefs_filtering_condition_define_done(MatcherList * matchers)
 
 static void prefs_filtering_condition_define(void)
 {
-       const gchar * cond_str;
+       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);
+               matchers = matcher_parser_get_cond(cond_str, NULL);
                if (matchers == NULL)
                        alertpanel_error(_("Condition string is not valid."));
        }
+       
+       g_free(cond_str);
 
        prefs_matcher_open(matchers, prefs_filtering_condition_define_done);
 
@@ -739,16 +1038,18 @@ static void prefs_filtering_action_define_done(GSList * action_list)
 
 static void prefs_filtering_action_define(void)
 {
-       const gchar * action_str;
+       gchar * action_str;
        GSList * action_list = NULL;
 
-       action_str = gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));
+       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);
@@ -768,39 +1069,51 @@ static void prefs_filtering_action_define(void)
 static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
 {
        MatcherList * cond;
-       const gchar * cond_str;
-       const gchar * action_str;
-       FilteringProp * prop;
+       gboolean enabled = TRUE;
+       gchar * name = NULL;
+       gint account_id = 0;
+       gchar * cond_str = NULL;
+       gchar * action_str = NULL;
+       FilteringProp * prop = NULL;
        GSList * action_list;
 
-       cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
+       name = gtk_editable_get_chars(GTK_EDITABLE(filtering.name_entry), 0, -1);
+       
+       account_id = combobox_get_active_data(GTK_COMBO_BOX(filtering.account_combobox));
+
+       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."));
-               return NULL;
+               goto fail;
        }
-
-       action_str = gtk_entry_get_text(GTK_ENTRY(filtering.action_entry));
+       
+       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."));
-               return NULL;
+               goto fail;
        }
 
-       cond = matcher_parser_get_cond(cond_str);
+       cond = matcher_parser_get_cond(cond_str, NULL);
 
        if (cond == NULL) {
                if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
-               return NULL;
+               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."));
-               return NULL;
+               goto fail;
        }
 
-       prop = filteringprop_new(cond, action_list);
+       prop = filteringprop_new(enabled, name, account_id, cond, action_list);
 
+fail:
+       g_free(name);
+       g_free(cond_str);
+       g_free(action_str);
        return prop;
 }
 
@@ -811,107 +1124,154 @@ static void prefs_filtering_register_cb(void)
        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);
+
+       prefs_filtering_reset_dialog();
+       modified = TRUE;
 }
 
 static void prefs_filtering_substitute_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
-       gint row;
-       FilteringProp * prop;
+       gint selected_row = gtkut_list_view_get_selected_row
+               (filtering.cond_list_view);
+       FilteringProp *prop;
+       gboolean enabled;
+       gchar *name;
+       gint account_id;
        
-       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(TRUE);
-       if (prop == NULL)
+
+       if (prop == NULL) 
                return;
-       prefs_filtering_clist_set_row(row, prop);
+
+       /* prop->emabled is always TRUE here, re-use the value from the selected row 
+          as we don't substitute this value from dialog */
+       prefs_filtering_list_view_get_rule_info(
+                       filtering.cond_list_view, selected_row,
+                       &enabled, &name, &account_id);
+       prop->enabled = enabled;
+
+       prefs_filtering_list_view_set_row(selected_row, prop);
 
        filteringprop_free(prop);
-       
-       prefs_filtering_update_hscrollbar();
+
+       prefs_filtering_reset_dialog();
+       modified = TRUE;
 }
 
 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 = gtkut_list_view_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)
+                      GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL) == G_ALERTDEFAULT)
                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;
 
-       prefs_filtering_reset_dialog();
+       gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 
-       prefs_filtering_update_hscrollbar();
+       prefs_filtering_reset_dialog();
+       modified = TRUE;
 }
 
 static void prefs_filtering_top(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
        gint row;
+       GtkTreeIter top, sel;
+       GtkTreeModel *model;
+
+       row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
+       if (row <= 1) 
+               return;
 
-       if (!clist->selection) 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;
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 1)
-               gtk_clist_row_move(clist, row, 1);
+       gtk_list_store_move_after(GTK_LIST_STORE(model), &sel, &top);
+       gtkut_list_view_select_row(filtering.cond_list_view, 1);
+       modified = TRUE;
 }
 
 static void prefs_filtering_up(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
        gint row;
+       GtkTreeIter top, sel;
+       GtkTreeModel *model;
+
+       row = gtkut_list_view_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 (!clist->selection) return;
+       if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row - 1)
+       ||  !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
+               return;
 
-       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); 
-       }
+       gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
+       gtkut_list_view_select_row(filtering.cond_list_view, row - 1);
+       modified = TRUE;
 }
 
 static void prefs_filtering_down(void)
 {
-       GtkCList *clist = GTK_CLIST(filtering.cond_clist);
-       gint row;
-
-       if (!clist->selection) return;
+       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 = gtkut_list_view_get_selected_row(filtering.cond_list_view);
+       if (row < 1 || row >= n_rows - 1)
+               return;
 
-       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); 
-       }
+       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);
+       gtkut_list_view_select_row(filtering.cond_list_view, row + 1);
+       modified = TRUE;
 }
 
 static void prefs_filtering_bottom(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 = gtkut_list_view_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, n_rows - 1))
+               return;
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 0 && row < clist->rows - 1)
-               gtk_clist_row_move(clist, row, clist->rows - 1);
+       gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);           
+       gtkut_list_view_select_row(filtering.cond_list_view, n_rows - 1);
+       modified = TRUE;
 }
 
 static void prefs_filtering_select_set(FilteringProp *prop)
@@ -925,7 +1285,12 @@ static void prefs_filtering_select_set(FilteringProp *prop)
        if (matcher_str == NULL) {
                return;
        }
+       
+       if (prop->name != NULL)
+               gtk_entry_set_text(GTK_ENTRY(filtering.name_entry), prop->name);
 
+       combobox_select_by_data(GTK_COMBO_BOX(filtering.account_combobox), prop->account_id);
+               
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), matcher_str);
 
         action_str = filteringaction_list_to_string(prop->action_list);
@@ -938,31 +1303,6 @@ static void prefs_filtering_select_set(FilteringProp *prop)
        g_free(matcher_str);
 }
 
-static void prefs_filtering_select(GtkCList *clist, gint row, gint column,
-                               GdkEvent *event)
-{
-       FilteringProp * prop;
-       gchar * filtering_str;
-
-       if (row == 0) {
-               prefs_filtering_reset_dialog();
-               return;
-       }
-
-        if (!gtk_clist_get_text(GTK_CLIST(filtering.cond_clist),
-                               row, 0, &filtering_str))
-               return;
-       
-       prop = matcher_parser_get_filtering(filtering_str);
-       if (prop == NULL)
-               return;
-
-       prefs_filtering_select_set(prop);
-
-       filteringprop_free(prop);
-}
-
-
 static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
@@ -973,12 +1313,14 @@ static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
 static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_Escape) {
                prefs_filtering_cancel();
-       return TRUE;                    
+               return TRUE;                    
+       }
+       return FALSE;
 }
 
-static void prefs_filtering_ok(void)
+static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
 {
        FilteringProp * prop;
        gchar * str;
@@ -987,25 +1329,74 @@ static void prefs_filtering_ok(void)
         AlertValue val;
        
        prop = prefs_filtering_dialog_to_filtering(FALSE);
+       
+       if (check_changed_list) {
+               if (modified && alertpanel(_("Filtering rules not saved"),
+                                        _("The list of filtering rules have been modified. Close anyway?"),
+                                        GTK_STOCK_CLOSE, _("+_Continue editing"), 
+                                        NULL) != G_ALERTDEFAULT) {
+                       return TRUE;
+               }
+       }
+       
+       /* check if a rule is being edited */
        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;
+               while (NULL != (filtering_str = (prefs_filtering_list_view_get_rule
+                                                       (filtering.cond_list_view,
+                                                        row)))) {
+                       if (strcmp(filtering_str, str) == 0)
+                               break;
                        row++;
-               }
-               if (strcmp(filtering_str, str) != 0) {
+                       g_free(filtering_str);
+               }       
+
+               if (!filtering_str) {
                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                _("Yes"), _("No"), NULL);
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
                        if (G_ALERTDEFAULT != val) {
-                               g_free(str);
-                               return;
+                               g_free(filtering_str);
+                               g_free(str); /* fixed two leaks: huzzah! */
+                               filteringprop_free(prop);
+                               return TRUE;
                        }
-               }
+               }               
+
+               g_free(filtering_str);
                g_free(str);
+               filteringprop_free(prop); /* fixed a leak: huzzah! */
+       } else {
+               gchar *name, *condition, *action;
+               name = gtk_editable_get_chars(GTK_EDITABLE(filtering.name_entry), 0, -1);
+               condition = gtk_editable_get_chars(GTK_EDITABLE(filtering.cond_entry), 0, -1);
+               action = gtk_editable_get_chars(GTK_EDITABLE(filtering.action_entry), 0, -1);
+               if (strlen(name) || 
+                   strlen(condition) || 
+                   strlen(action)) {
+                       val = alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
+                       if (G_ALERTDEFAULT != val) {
+                               g_free(name);
+                               g_free(condition);
+                               g_free(action);
+                               return TRUE;
+                       }
+               }
+               g_free(name);
+               g_free(condition);
+               g_free(action);
        }
+       return FALSE;
+}
+
+static void prefs_filtering_ok(void)
+{
+       if (prefs_filtering_check_mod(FALSE))
+               return;
+       modified = FALSE;
        prefs_filtering_set_list();
        prefs_matcher_write_config();
        prefs_filtering_close();
@@ -1013,6 +1404,270 @@ static void prefs_filtering_ok(void)
 
 static void prefs_filtering_cancel(void)
 {
+       if (prefs_filtering_check_mod(TRUE))
+               return;
+       modified = FALSE;
        prefs_matcher_read_config();
        prefs_filtering_close();
 }
+
+static GtkListStore* prefs_filtering_create_data_store(void)
+{
+       return gtk_list_store_new(N_PREFS_FILTERING_COLUMNS,
+                                 G_TYPE_BOOLEAN,
+                                 G_TYPE_STRING,
+                                 G_TYPE_INT,
+                                 G_TYPE_STRING,
+                                 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       enabled TRUE if rule is enabled
+ *\param       name The Name of rule
+ *\param       account_id The account ID
+ *\param       account_name The account name or All or (New)
+ *\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,
+                                                 gboolean enabled,
+                                                 const gchar *name,
+                                                 gint account_id,
+                                                 const gchar *account_name,
+                                                 const gchar *rule,
+                                                 gboolean prop) 
+{
+       GtkTreeIter iter;
+
+       /* 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;                                                  
+       }
+
+       if (row < 0) {
+               /* append new */
+               gtk_list_store_append(list_store, &iter);
+               gtk_list_store_set(list_store, &iter, 
+                                  PREFS_FILTERING_ENABLED, enabled,
+                                  PREFS_FILTERING_NAME, name,
+                                  PREFS_FILTERING_ACCOUNT_ID, account_id,
+                                  PREFS_FILTERING_ACCOUNT_NAME, account_name,
+                                  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_ENABLED, enabled,
+                                  PREFS_FILTERING_NAME, name,
+                                  PREFS_FILTERING_ACCOUNT_ID, account_id,
+                                  PREFS_FILTERING_ACCOUNT_NAME, account_name,
+                                  PREFS_FILTERING_RULE, rule,
+                                  -1);
+               return row;                                
+       }
+}
+
+/*!
+ *\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_list_view_get_rule_info(GtkWidget *list, gint row,
+                               gboolean *enabled, gchar **name, gint *account_id)
+{      
+       GtkTreeView *list_view = GTK_TREE_VIEW(list);
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       GtkTreeIter iter;
+
+       *enabled = TRUE;
+       *name = NULL;
+
+       if (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
+               gtk_tree_model_get(model, &iter, 
+                                  PREFS_FILTERING_ENABLED, enabled,
+                                  PREFS_FILTERING_NAME, name,
+                                  PREFS_FILTERING_ACCOUNT_ID, account_id,
+                                  -1);
+       }
+}
+
+/*!
+ *\brief       Create list view for filtering
+ */
+static GtkWidget *prefs_filtering_list_view_create(void)
+{
+       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.use_stripes_everywhere);
+       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);
+
+       /* create the columns */
+       prefs_filtering_create_list_view_columns(GTK_WIDGET(list_view));
+
+       return GTK_WIDGET(list_view);
+}
+
+static void prefs_filtering_enable_toggled(GtkCellRendererToggle *widget,
+               gchar *path,
+               GtkWidget *list_view)
+{
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list_view));
+       gboolean enabled = TRUE;
+
+       if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
+               return;
+
+       gtk_tree_model_get(model, &iter,
+                          PREFS_FILTERING_ENABLED, &enabled,
+                          -1);
+
+       gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+                          PREFS_FILTERING_ENABLED, !enabled,
+                          -1);
+}
+
+static void prefs_filtering_create_list_view_columns(GtkWidget *list_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_toggle_new();
+       g_object_set(renderer,
+                    "radio", FALSE,
+                    "activatable", TRUE,
+                    NULL);
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Enable"), /* FIXME : Enable, Enabled, or 'E' ? */
+                renderer,
+                "active", PREFS_FILTERING_ENABLED,
+                NULL);
+       gtk_tree_view_column_set_alignment (column, 0.5);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+       g_signal_connect(G_OBJECT(renderer), "toggled",
+                        G_CALLBACK(prefs_filtering_enable_toggled),
+                        list_view);
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Name"),
+                renderer,
+                "text", PREFS_FILTERING_NAME,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+       gtk_tree_view_column_set_resizable(column, TRUE);
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Account"),
+                renderer,
+                "text", PREFS_FILTERING_ACCOUNT_NAME,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+       gtk_tree_view_column_set_resizable(column, TRUE);
+
+       filtering.account_name_column = column;
+               
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Rule"),
+                renderer,
+                "text", PREFS_FILTERING_RULE,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+}
+
+/*!
+ *\brief       Triggered when a row is selected
+ */
+static gboolean prefs_filtering_selected(GtkTreeSelection *selector,
+                                        GtkTreeModel *model, 
+                                        GtkTreePath *path,
+                                        gboolean currently_selected,
+                                        gpointer data)
+{
+       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;
+                       gchar *name = NULL;
+                       gint account_id = 0;
+
+                       gtk_tree_model_get(model, &iter,
+                                          PREFS_FILTERING_RULE, &filtering_str,
+                                          -1);
+                       gtk_tree_model_get(model, &iter,
+                                          PREFS_FILTERING_NAME, &name,
+                                          -1);
+                       gtk_tree_model_get(model, &iter,
+                                          PREFS_FILTERING_ACCOUNT_ID, &account_id,
+                                          -1);
+
+                       prop = matcher_parser_get_filtering(filtering_str);
+                       if (prop) {
+                               prop->name = g_strdup(name);
+                               prop->account_id = account_id;
+                               prefs_filtering_select_set(prop);
+                               filteringprop_free(prop);
+                       }                               
+                       g_free(name);
+                       g_free(filtering_str);
+               } else
+                       prefs_filtering_reset_dialog();
+       }               
+
+       return TRUE;
+}
+