fix segfault in prefs_matcher.c
[claws.git] / src / prefs_matcher.c
index df0bfbf274c97110578310aadec42e364bdcc542..02d4cb9a5541c30e4a5b782264d6bd45b8dfc150 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "intl.h"
 #include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "prefs_matcher.h"
 #include "prefs_common.h"
 #include "mainwindow.h"
 #include "gtkutils.h"
 #include "alertpanel.h"
 #include "folder.h"
+#include "description_window.h"
 
 #include "matcher_parser.h"
+#include "colorlabel.h"
 
+/*!
+ *\brief       UI data for matcher dialog
+ */
 static struct Matcher {
        GtkWidget *window;
 
@@ -71,14 +76,26 @@ static struct Matcher {
        GtkWidget *value_label;
        GtkWidget *case_chkbtn;
        GtkWidget *regexp_chkbtn;
+       GtkWidget *color_optmenu;
 
        GtkWidget *exec_btn;
 
        GtkWidget *cond_clist;
-} matcher;
 
-/* choice in the list */
+       GtkWidget *criteria_table;
+
+       gint selected_criteria; /*!< selected criteria in combobox */ 
+} matcher;
 
+/*!
+ *\brief       Conditions with a negate counterpart (like unread and ~unread)
+ *             have the same CRITERIA_XXX id). I.e. both unread and ~unread
+ *             have criteria id CRITERIA_UNREAD. This id is passed as the
+ *             first parameter to #matcherprop_new and #matcherprop_unquote_new.
+ *
+ *\warning     Currently the enum constants should have the same order as the 
+ *             #criteria_text  
+ */            
 enum {
        CRITERIA_ALL = 0,
 
@@ -103,97 +120,109 @@ enum {
        CRITERIA_DELETED = 18,
        CRITERIA_REPLIED = 19,
        CRITERIA_FORWARDED = 20,
+       CRITERIA_LOCKED = 21,
+       CRITERIA_COLORLABEL = 22,
+       CRITERIA_IGNORE_THREAD = 23,
+
+       CRITERIA_SCORE_GREATER = 24,
+       CRITERIA_SCORE_LOWER = 25,
+       CRITERIA_SCORE_EQUAL = 26,
 
-       CRITERIA_SCORE_GREATER = 21,
-       CRITERIA_SCORE_LOWER = 22,
-       CRITERIA_SCORE_EQUAL = 23,
+       CRITERIA_EXECUTE = 27,
 
-       CRITERIA_EXECUTE = 24,
+       CRITERIA_SIZE_GREATER = 28,
+       CRITERIA_SIZE_SMALLER = 29,
+       CRITERIA_SIZE_EQUAL   = 30
+};
 
-       CRITERIA_SIZE_GREATER = 25,
-       CRITERIA_SIZE_SMALLER = 26,
-       CRITERIA_SIZE_EQUAL   = 27
+/*!
+ *\brief       Descriptive text for conditions
+ */
+static const gchar *criteria_text [] = {
+       N_("All messages"), N_("Subject"),
+       N_("From"), N_("To"), N_("Cc"), N_("To or Cc"),
+       N_("Newsgroups"), N_("In reply to"), N_("References"),
+       N_("Age greater than"), N_("Age lower than"),
+       N_("Header"), N_("Headers part"),
+       N_("Body part"), N_("Whole message"),
+       N_("Unread flag"), N_("New flag"),
+       N_("Marked flag"), N_("Deleted flag"),
+       N_("Replied flag"), N_("Forwarded flag"),
+       N_("Locked flag"),
+       N_("Color label"),
+       N_("Ignore thread"),
+       N_("Score greater than"), N_("Score lower than"),
+       N_("Score equal to"),
+       N_("Execute"),
+       N_("Size greater than"), 
+       N_("Size smaller than"),
+       N_("Size exactly")
 };
 
+/*!
+ *\brief       Boolean / predicate constants
+ *
+ *\warning     Same order as #bool_op_text!
+ */
 enum {
        BOOL_OP_OR = 0,
        BOOL_OP_AND = 1
 };
 
-gchar * bool_op_text [] = {
+/*!
+ *\brief       Descriptive text in UI
+ */
+static const gchar *bool_op_text [] = {
        N_("or"), N_("and")
 };
 
+/*!
+ *\brief       Contains predicate      
+ *
+ *\warning     Same order as in #predicate_text
+ */
 enum {
        PREDICATE_CONTAINS = 0,
        PREDICATE_DOES_NOT_CONTAIN = 1
 };
 
-gchar * predicate_text [] = {
+/*!
+ *\brief       Descriptive text in UI for predicate
+ */
+static const gchar *predicate_text [] = {
        N_("contains"), N_("does not contain")
 };
 
+/*!
+ *\brief       Enabled predicate
+ *
+ *\warning     Same order as in #predicate_flag_text
+ */
 enum {
        PREDICATE_FLAG_ENABLED = 0,
        PREDICATE_FLAG_DISABLED = 1
 };
 
-gchar * predicate_flag_text [] = {
+/*!
+ *\brief       Descriptive text in UI for enabled flag
+ */
+static const gchar *predicate_flag_text [] = {
        N_("yes"), N_("no")
 };
 
-gchar * criteria_text [] = {
-       N_("All messages"), N_("Subject"),
-       N_("From"), N_("To"), N_("Cc"), N_("To or Cc"),
-       N_("Newsgroups"), N_("In reply to"), N_("References"),
-       N_("Age greater than"), N_("Age lower than"),
-       N_("Header"), N_("Headers part"),
-       N_("Body part"), N_("Whole message"),
-       N_("Unread flag"), N_("New flag"),
-       N_("Marked flag"), N_("Deleted flag"),
-       N_("Replied flag"), N_("Forwarded flag"),
-       N_("Score greater than"), N_("Score lower than"),
-       N_("Score equal to"),
-       N_("Execute"),
-       N_("Size greater than"), 
-       N_("Size smaller than"),
-       N_("Size exactly")
-};
-
-static gint get_sel_from_list(GtkList * list)
-{
-       gint row = 0;
-       void * sel;
-       GList * child;
-
-       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 PrefsMatcherSignal * matchers_callback;
+/*!
+ *\brief       Hooks
+ */
+static PrefsMatcherSignal *matchers_callback;
 
 /* widget creating functions */
 static void prefs_matcher_create       (void);
 
-static void prefs_matcher_set_dialog   (MatcherList * matchers);
-
-/*
-static void prefs_matcher_set_list     (void);
-static gint prefs_matcher_clist_set_row        (gint    row);
-*/
+static void prefs_matcher_set_dialog   (MatcherList *matchers);
+static gint prefs_matcher_clist_set_row        (gint row, MatcherProp *prop);
 
 /* callback functions */
 
-/*
-static void prefs_matcher_select_dest_cb       (void);
-*/
 static void prefs_matcher_register_cb  (void);
 static void prefs_matcher_substitute_cb        (void);
 static void prefs_matcher_delete_cb    (void);
@@ -203,21 +232,50 @@ static void prefs_matcher_select  (GtkCList       *clist,
                                         gint            row,
                                         gint            column,
                                         GdkEvent       *event);
-
 static void prefs_matcher_key_pressed  (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
 static void prefs_matcher_ok           (void);
-static void prefs_matcher_cancel               (void);
-static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
-                                 gpointer data);
-static void prefs_matcher_criteria_select(GtkList *list,
-                                         GtkWidget *widget,
-                                         gpointer user_data);
-static MatcherList * prefs_matcher_get_list(void);
-static void prefs_matcher_exec_info_create(void);
+static void prefs_matcher_cancel       (void);
+static gint prefs_matcher_deleted      (GtkWidget *widget, GdkEventAny *event,
+                                        gpointer data);
+static void prefs_matcher_criteria_select      (GtkList   *list,
+                                                GtkWidget *widget,
+                                                gpointer   user_data);
+static MatcherList *prefs_matcher_get_list     (void);
+
 
-void prefs_matcher_open(MatcherList * matchers, PrefsMatcherSignal * cb)
+/*!
+ *\brief       Find index of list selection 
+ *
+ *\param       list GTK list widget
+ *
+ *\return      gint Selection index
+ */
+static gint get_sel_from_list(GtkList *list)
+{
+       gint row = 0;
+       void * sel;
+       GList * child;
+
+       sel = list->selection->data;
+       for (child = list->children; child != NULL; child = g_list_next(child)) {
+               if (child->data == sel)
+                       return row;
+               row ++;
+       }
+       
+       return row;
+}
+
+/*!
+ *\brief       Opens the matcher dialog with a list of conditions
+ *
+ *\param       matchers List of conditions
+ *\param       cb Callback
+ *
+ */
+void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
 {
        inc_lock();
 
@@ -235,6 +293,9 @@ void prefs_matcher_open(MatcherList * matchers, PrefsMatcherSignal * cb)
        gtk_widget_show(matcher.window);
 }
 
+/*!
+ *\brief       Create the matcher dialog
+ */
 static void prefs_matcher_create(void)
 {
        GtkWidget *window;
@@ -246,7 +307,7 @@ static void prefs_matcher_create(void)
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *vbox3;
-       GtkWidget *table1;
+       GtkWidget *criteria_table;
 
        GtkWidget *hbox1;
 
@@ -287,6 +348,8 @@ static void prefs_matcher_create(void)
 
        GtkWidget *exec_btn;
 
+       GtkWidget *color_optmenu;
+
        GList *combo_items;
        gint i;
 
@@ -294,61 +357,60 @@ static void prefs_matcher_create(void)
 
        debug_print("Creating matcher configuration window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
-       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_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);
+       window = gtk_window_new(GTK_WINDOW_DIALOG);
+       gtk_container_set_border_width(GTK_CONTAINER(window), 8);
+       gtk_window_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);
 
-       vbox = gtk_vbox_new (FALSE, 6);
-       gtk_widget_show (vbox);
-       gtk_container_add (GTK_CONTAINER (window), vbox);
+       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);
-       gtk_widget_show (confirm_area);
-       gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_default (ok_btn);
-
-       gtk_window_set_title (GTK_WINDOW(window),
-                             _("Condition configuration"));
-       gtk_signal_connect (GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
-                           GTK_SIGNAL_FUNC(prefs_matcher_key_pressed), NULL);
-       MANAGE_WINDOW_SIGNALS_CONNECT (window);
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_matcher_ok), NULL);
-       gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_matcher_cancel), NULL);
-
-       vbox1 = gtk_vbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox1);
-       gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
-       table1 = gtk_table_new (2, 4, FALSE);
-       gtk_widget_show (table1);
-
-       gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0);
-       gtk_table_set_row_spacings (GTK_TABLE (table1), 8);
-       gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
+       gtk_widget_show(confirm_area);
+       gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
+       gtk_widget_grab_default(ok_btn);
+
+       gtk_window_set_title(GTK_WINDOW(window),
+                            _("Condition configuration"));
+       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+                          GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
+       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+                          GTK_SIGNAL_FUNC(prefs_matcher_key_pressed), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
+       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
+                          GTK_SIGNAL_FUNC(prefs_matcher_ok), NULL);
+       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
+                          GTK_SIGNAL_FUNC(prefs_matcher_cancel), NULL);
+
+       vbox1 = gtk_vbox_new(FALSE, VSPACING);
+       gtk_widget_show(vbox1);
+       gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
+       gtk_container_set_border_width(GTK_CONTAINER (vbox1), 2);
+
+       criteria_table = gtk_table_new(2, 4, FALSE);
+       gtk_widget_show(criteria_table);
+
+       gtk_box_pack_start(GTK_BOX(vbox1), criteria_table, FALSE, FALSE, 0);
+       gtk_table_set_row_spacings(GTK_TABLE(criteria_table), 8);
+       gtk_table_set_col_spacings(GTK_TABLE(criteria_table), 8);
 
        /* criteria combo box */
 
-       criteria_label = gtk_label_new (_("Match type"));
-       gtk_widget_show (criteria_label);
-       gtk_misc_set_alignment (GTK_MISC (criteria_label), 0, 0.5);
-       gtk_table_attach (GTK_TABLE (table1), criteria_label, 0, 1, 0, 1,
-                         GTK_FILL, 0, 0, 0);
+       criteria_label = gtk_label_new(_("Match type"));
+       gtk_widget_show(criteria_label);
+       gtk_misc_set_alignment(GTK_MISC(criteria_label), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(criteria_table), criteria_label, 0, 1, 0, 1,
+                        GTK_FILL, 0, 0, 0);
 
-       criteria_combo = gtk_combo_new ();
-       gtk_widget_show (criteria_combo);
+       criteria_combo = gtk_combo_new();
+       gtk_widget_show(criteria_combo);
 
        combo_items = NULL;
 
-       for(i = 0 ; i < (gint) (sizeof(criteria_text) / sizeof(gchar *)) ;
-           i++) {
+       for (i = 0; i < (gint) (sizeof(criteria_text) / sizeof(gchar *)); i++) {
                combo_items = g_list_append(combo_items,
                                            (gpointer) _(criteria_text[i]));
        }
@@ -356,86 +418,89 @@ static void prefs_matcher_create(void)
 
        g_list_free(combo_items);
 
-       gtk_widget_set_usize (criteria_combo, 120, -1);
-       gtk_table_attach (GTK_TABLE (table1), criteria_combo, 0, 1, 1, 2,
+       gtk_widget_set_usize(criteria_combo, 120, -1);
+       gtk_table_attach(GTK_TABLE(criteria_table), criteria_combo, 0, 1, 1, 2,
                          0, 0, 0, 0);
        criteria_list = GTK_COMBO(criteria_combo)->list;
-       gtk_signal_connect (GTK_OBJECT (criteria_list), "select-child",
-                           GTK_SIGNAL_FUNC (prefs_matcher_criteria_select),
-                           NULL);
+       gtk_signal_connect(GTK_OBJECT(criteria_list), "select-child",
+                          GTK_SIGNAL_FUNC(prefs_matcher_criteria_select),
+                          NULL);
 
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(criteria_combo)->entry),
                               FALSE);
 
        /* header name */
 
-       header_label = gtk_label_new (_("Header name"));
-       gtk_widget_show (header_label);
-       gtk_misc_set_alignment (GTK_MISC (header_label), 0, 0.5);
-       gtk_table_attach (GTK_TABLE (table1), header_label, 1, 2, 0, 1,
-                         GTK_FILL, 0, 0, 0);
-
-       header_combo = gtk_combo_new ();
-       gtk_widget_show (header_combo);
-       gtk_widget_set_usize (header_combo, 96, -1);
-       gtkut_combo_set_items (GTK_COMBO (header_combo),
-                              "Subject", "From", "To", "Cc", "Reply-To",
-                              "Sender", "X-ML-Name", "X-List", "X-Sequence",
-                              "X-Mailer","X-BeenThere",
-                              NULL);
-       gtk_table_attach (GTK_TABLE (table1), header_combo, 1, 2, 1, 2,
-                         0, 0, 0, 0);
-       header_entry = GTK_COMBO (header_combo)->entry;
-       gtk_entry_set_editable (GTK_ENTRY (header_entry), TRUE);
+       header_label = gtk_label_new(_("Header name"));
+       gtk_widget_show(header_label);
+       gtk_misc_set_alignment(GTK_MISC(header_label), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(criteria_table), header_label, 1, 2, 0, 1,
+                        GTK_FILL, 0, 0, 0);
+
+       header_combo = gtk_combo_new();
+       gtk_widget_show(header_combo);
+       gtk_widget_set_usize(header_combo, 96, -1);
+       gtkut_combo_set_items(GTK_COMBO (header_combo),
+                             "Subject", "From", "To", "Cc", "Reply-To",
+                             "Sender", "X-ML-Name", "X-List", "X-Sequence",
+                             "X-Mailer","X-BeenThere",
+                             NULL);
+       gtk_table_attach(GTK_TABLE(criteria_table), header_combo, 1, 2, 1, 2,
+                        0, 0, 0, 0);
+       header_entry = GTK_COMBO(header_combo)->entry;
+       gtk_entry_set_editable(GTK_ENTRY(header_entry), TRUE);
 
        /* value */
 
-       value_label = gtk_label_new (_("Value"));
-       gtk_widget_show (value_label);
-       gtk_misc_set_alignment (GTK_MISC (value_label), 0, 0.5);
-       gtk_table_attach (GTK_TABLE (table1), value_label, 2, 3, 0, 1,
-                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-
-       value_entry = gtk_entry_new ();
-       gtk_widget_show (value_entry);
-       gtk_widget_set_usize (value_entry, 200, -1);
-       gtk_table_attach (GTK_TABLE (table1), value_entry, 2, 3, 1, 2,
-                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-
-       exec_btn = gtk_button_new_with_label (_("Info ..."));
-       gtk_widget_show (exec_btn);
-       gtk_table_attach (GTK_TABLE (table1), exec_btn, 3, 4, 1, 2,
-                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT (exec_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_matcher_exec_info),
-                           NULL);
+       value_label = gtk_label_new(_("Value"));
+       gtk_widget_show(value_label);
+       gtk_misc_set_alignment(GTK_MISC (value_label), 0, 0.5);
+       gtk_table_attach(GTK_TABLE(criteria_table), value_label, 2, 3, 0, 1,
+                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+
+       value_entry = gtk_entry_new();
+       gtk_widget_show(value_entry);
+       gtk_widget_set_usize(value_entry, 200, -1);
+       gtk_table_attach(GTK_TABLE(criteria_table), value_entry, 2, 3, 1, 2,
+                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+
+       exec_btn = gtk_button_new_with_label(_("Info ..."));
+       gtk_widget_show(exec_btn);
+       gtk_table_attach(GTK_TABLE (criteria_table), exec_btn, 3, 4, 1, 2,
+                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+       gtk_signal_connect(GTK_OBJECT (exec_btn), "clicked",
+                          GTK_SIGNAL_FUNC (prefs_matcher_exec_info),
+                          NULL);
+
+       color_optmenu = gtk_option_menu_new();
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
+                                colorlabel_create_color_menu());
 
        /* predicate */
 
-       vbox2 = gtk_vbox_new (FALSE, VSPACING);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+       vbox2 = gtk_vbox_new(FALSE, VSPACING);
+       gtk_widget_show(vbox2);
+       gtk_box_pack_start(GTK_BOX(vbox1), vbox2, FALSE, FALSE, 0);
 
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+       hbox1 = gtk_hbox_new(FALSE, 8);
+       gtk_widget_show(hbox1);
+       gtk_box_pack_start(GTK_BOX(vbox2), hbox1, FALSE, FALSE, 0);
 
-       predicate_label = gtk_label_new (_("Predicate"));
-       gtk_widget_show (predicate_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), predicate_label,
-                           FALSE, FALSE, 0);
+       predicate_label = gtk_label_new(_("Predicate"));
+       gtk_widget_show(predicate_label);
+       gtk_box_pack_start(GTK_BOX(hbox1), predicate_label,
+                          FALSE, FALSE, 0);
 
-       predicate_combo = gtk_combo_new ();
-       gtk_widget_show (predicate_combo);
-       gtk_widget_set_usize (predicate_combo, 120, -1);
+       predicate_combo = gtk_combo_new();
+       gtk_widget_show(predicate_combo);
+       gtk_widget_set_usize(predicate_combo, 120, -1);
        predicate_list = GTK_COMBO(predicate_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_combo)->entry),
                               FALSE);
 
        combo_items = NULL;
 
-       for(i = 0 ; i < (gint) (sizeof(predicate_text) / sizeof(gchar *)) ;
-           i++) {
+       for (i = 0; i < (gint) (sizeof(predicate_text) / sizeof(gchar *)); i++) {
                combo_items = g_list_append(combo_items,
                                            (gpointer) _(predicate_text[i]));
        }
@@ -443,21 +508,20 @@ static void prefs_matcher_create(void)
 
        g_list_free(combo_items);
 
-       gtk_box_pack_start (GTK_BOX (hbox1), predicate_combo,
-                           FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox1), predicate_combo,
+                          FALSE, FALSE, 0);
 
        /* predicate flag */
 
-       predicate_flag_combo = gtk_combo_new ();
-       gtk_widget_hide (predicate_flag_combo);
-       gtk_widget_set_usize (predicate_flag_combo, 120, -1);
+       predicate_flag_combo = gtk_combo_new();
+       gtk_widget_hide(predicate_flag_combo);
+       gtk_widget_set_usize(predicate_flag_combo, 120, -1);
        predicate_flag_list = GTK_COMBO(predicate_flag_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_flag_combo)->entry), FALSE);
 
        combo_items = NULL;
 
-       for(i = 0 ; i < (gint) (sizeof(predicate_text) / sizeof(gchar *)) ;
-           i++) {
+       for (i = 0; i < (gint) (sizeof(predicate_text) / sizeof(gchar *)); i++) {
                combo_items = g_list_append(combo_items, (gpointer) _(predicate_flag_text[i]));
        }
        gtk_combo_set_popdown_strings(GTK_COMBO(predicate_flag_combo),
@@ -465,69 +529,68 @@ static void prefs_matcher_create(void)
 
        g_list_free(combo_items);
 
-       gtk_box_pack_start (GTK_BOX (hbox1), predicate_flag_combo,
-                           FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox1), predicate_flag_combo,
+                          FALSE, FALSE, 0);
 
-       vbox3 = gtk_vbox_new (FALSE, 0);
+       vbox3 = gtk_vbox_new(FALSE, 0);
        gtk_widget_show (vbox3);
-       gtk_box_pack_start (GTK_BOX (hbox1), vbox3, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox1), vbox3, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (vbox3, case_chkbtn, _("Case sensitive"));
-       PACK_CHECK_BUTTON (vbox3, regexp_chkbtn, _("Use regexp"));
+       PACK_CHECK_BUTTON(vbox3, case_chkbtn, _("Case sensitive"));
+       PACK_CHECK_BUTTON(vbox3, regexp_chkbtn, _("Use regexp"));
 
        /* 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);
-
-       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);
-
-       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"));
-       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_matcher_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_matcher_substitute_cb),
-                           NULL);
-
-       del_btn = gtk_button_new_with_label (_("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_matcher_delete_cb), NULL);
+       reg_hbox = gtk_hbox_new(FALSE, 4);
+       gtk_widget_show(reg_hbox);
+       gtk_box_pack_start(GTK_BOX(vbox1), reg_hbox, FALSE, FALSE, 0);
+
+       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);
+
+       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"));
+       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_matcher_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_matcher_substitute_cb),
+                          NULL);
+
+       del_btn = gtk_button_new_with_label(_("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_matcher_delete_cb), NULL);
 
        /* boolean operation */
 
-       bool_op_label = gtk_label_new (_("Boolean Op"));
-       gtk_misc_set_alignment (GTK_MISC (value_label), 0, 0.5);
-       gtk_widget_show (bool_op_label);
-       gtk_box_pack_start (GTK_BOX (btn_hbox), bool_op_label,
-                           FALSE, FALSE, 0);
+       bool_op_label = gtk_label_new(_("Boolean Op"));
+       gtk_misc_set_alignment(GTK_MISC(value_label), 0, 0.5);
+       gtk_widget_show(bool_op_label);
+       gtk_box_pack_start(GTK_BOX(btn_hbox), bool_op_label,
+                          FALSE, FALSE, 0);
 
-       bool_op_combo = gtk_combo_new ();
-       gtk_widget_show (bool_op_combo);
-       gtk_widget_set_usize (bool_op_combo, 50, -1);
+       bool_op_combo = gtk_combo_new();
+       gtk_widget_show(bool_op_combo);
+       gtk_widget_set_usize(bool_op_combo, 50, -1);
        bool_op_list = GTK_COMBO(bool_op_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(bool_op_combo)->entry),
                               FALSE);
 
        combo_items = NULL;
 
-       for(i = 0 ; i < (gint) (sizeof(bool_op_text) / sizeof(gchar *)) ;
-           i++) {
+       for (i = 0; i < (gint) (sizeof(bool_op_text) / sizeof(gchar *)); i++) {
                combo_items = g_list_append(combo_items,
                                            (gpointer) _(bool_op_text[i]));
        }
@@ -535,49 +598,49 @@ static void prefs_matcher_create(void)
 
        g_list_free(combo_items);
 
-       gtk_box_pack_start (GTK_BOX (btn_hbox), bool_op_combo,
-                           FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_hbox), bool_op_combo,
+                          FALSE, FALSE, 0);
 
-       cond_hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (cond_hbox);
-       gtk_box_pack_start (GTK_BOX (vbox1), cond_hbox, TRUE, TRUE, 0);
+       cond_hbox = gtk_hbox_new(FALSE, 8);
+       gtk_widget_show(cond_hbox);
+       gtk_box_pack_start(GTK_BOX(vbox1), 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_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);
+       cond_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_widget_show(cond_scrolledwin);
+       gtk_widget_set_usize(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 condition 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_matcher_select), NULL);
-
-       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"));
-       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_matcher_up), NULL);
-
-       down_btn = gtk_button_new_with_label (_("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_matcher_down), NULL);
+       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_matcher_select), NULL);
+
+       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"));
+       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_matcher_up), NULL);
+
+       down_btn = gtk_button_new_with_label(_("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_matcher_down), NULL);
 
        gtk_widget_show_all(window);
 
@@ -600,15 +663,25 @@ static void prefs_matcher_create(void)
        matcher.regexp_chkbtn = regexp_chkbtn;
        matcher.bool_op_list = bool_op_list;
        matcher.exec_btn = exec_btn;
+       matcher.color_optmenu = color_optmenu;
+       matcher.criteria_table = criteria_table;
 
-       matcher.cond_clist   = cond_clist;
+       matcher.cond_clist = cond_clist;
 }
 
-static gint prefs_matcher_clist_set_row(gint row, MatcherProp * prop)
+/*!
+ *\brief       Set the contents of a row
+ *
+ *\param       row Index of row to set
+ *\param       prop Condition to set
+ *
+ *\return      gint Row index \a prop has been added
+ */
+static gint prefs_matcher_clist_set_row(gint row, MatcherProp *prop)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gchar * cond_str[1];
-       gchar * matcher_str;
+       gchar *cond_str[1];
+       gchar *matcher_str;
 
        if (prop == NULL) {
                cond_str[0] = _("(New)");
@@ -626,6 +699,9 @@ static gint prefs_matcher_clist_set_row(gint row, MatcherProp * prop)
        return row;
 }
 
+/*!
+ *\brief       Clears a condition in the list widget
+ */
 static void prefs_matcher_reset_condition(void)
 {
        gtk_list_select_item(GTK_LIST(matcher.criteria_list), 0);
@@ -634,16 +710,24 @@ static void prefs_matcher_reset_condition(void)
        gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), "");
 }
 
+/*!
+ *\brief       Update scrollbar
+ */
 static void prefs_matcher_update_hscrollbar(void)
 {
        gint optwidth = gtk_clist_optimal_column_width(GTK_CLIST(matcher.cond_clist), 0);
        gtk_clist_set_column_width(GTK_CLIST(matcher.cond_clist), 0, optwidth);
 }
 
-static void prefs_matcher_set_dialog(MatcherList * matchers)
+/*!
+ *\brief       Initializes dialog with a set of conditions
+ *
+ *\param       matchers List of conditions
+ */
+static void prefs_matcher_set_dialog(MatcherList *matchers)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       GSList * cur;
+       GSList *cur;
        gboolean bool_op = 1;
 
        gtk_clist_freeze(clist);
@@ -651,9 +735,9 @@ static void prefs_matcher_set_dialog(MatcherList * matchers)
 
        prefs_matcher_clist_set_row(-1, NULL);
        if (matchers != NULL) {
-               for (cur = matchers->matchers ; cur != NULL ;
+               for (cur = matchers->matchers; cur != NULL;
                     cur = g_slist_next(cur)) {
-                       MatcherProp * prop;
+                       MatcherProp *prop;
                        prop = (MatcherProp *) cur->data;
                        prefs_matcher_clist_set_row(-1, prop);
                }
@@ -670,14 +754,20 @@ static void prefs_matcher_set_dialog(MatcherList * matchers)
        prefs_matcher_reset_condition();
 }
 
-static MatcherList * prefs_matcher_get_list(void)
+/*!
+ *\brief       Converts current conditions in list box in
+ *             a matcher list used by the matcher.
+ *
+ *\return      MatcherList * List of conditions.
+ */
+static MatcherList *prefs_matcher_get_list(void)
 {
-       gchar * matcher_str;
-       MatcherProp * prop;
+       gchar *matcher_str;
+       MatcherProp *prop;
        gint row = 1;
        gboolean bool_and;
-       GSList * matcher_list;
-       MatcherList * matchers;
+       GSList *matcher_list;
+       MatcherList *matchers;
 
        matcher_list = NULL;
 
@@ -703,6 +793,15 @@ static MatcherList * prefs_matcher_get_list(void)
        return matchers;
 }
 
+/*!
+ *\brief       Maps a keyword id (see #get_matchparser_tab_id) to a 
+ *             criteria type (see first parameter of #matcherprop_new
+ *             or #matcherprop_unquote_new)
+ *
+ *\param       matching_id Id returned by the matcher parser.
+ *
+ *\return      gint One of the CRITERIA_xxx constants.
+ */
 static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
 {
        switch(matching_id) {
@@ -720,13 +819,21 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_NOT_DELETED:
        case MATCHCRITERIA_DELETED:
                return CRITERIA_DELETED;
-               break;
        case MATCHCRITERIA_NOT_REPLIED:
        case MATCHCRITERIA_REPLIED:
                return CRITERIA_REPLIED;
        case MATCHCRITERIA_NOT_FORWARDED:
        case MATCHCRITERIA_FORWARDED:
                return CRITERIA_FORWARDED;
+       case MATCHCRITERIA_LOCKED:
+       case MATCHCRITERIA_NOT_LOCKED:
+               return CRITERIA_LOCKED;
+       case MATCHCRITERIA_COLORLABEL:
+       case MATCHCRITERIA_NOT_COLORLABEL:
+               return CRITERIA_COLORLABEL;
+       case MATCHCRITERIA_IGNORE_THREAD:
+       case MATCHCRITERIA_NOT_IGNORE_THREAD:
+               return CRITERIA_IGNORE_THREAD;
        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_SUBJECT:
                return CRITERIA_SUBJECT;
@@ -788,6 +895,14 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        }
 }
 
+/*!
+ *\brief       Returns the matcher keyword id from a criteria id
+ *
+ *\param       criteria_id Criteria id (should not be the negate
+ *             one)
+ *
+ *\return      gint A matcher keyword id. See #get_matchparser_tab_id.
+ */
 static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
 {
        switch (criteria_id) {
@@ -805,6 +920,12 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_REPLIED;
        case CRITERIA_FORWARDED:
                return MATCHCRITERIA_FORWARDED;
+       case CRITERIA_LOCKED:
+               return MATCHCRITERIA_LOCKED;
+       case CRITERIA_COLORLABEL:
+               return MATCHCRITERIA_COLORLABEL;
+       case CRITERIA_IGNORE_THREAD:
+               return MATCHCRITERIA_IGNORE_THREAD;
        case CRITERIA_SUBJECT:
                return MATCHCRITERIA_SUBJECT;
        case CRITERIA_FROM:
@@ -852,6 +973,14 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
        }
 }
 
+/*!
+ *\brief       Returns the negate matcher keyword id from a matcher keyword
+ *             id.
+ *
+ *\param       matcher_criteria Matcher keyword id. 
+ *
+ *\return      gint A matcher keyword id. See #get_matchparser_tab_id.
+ */
 static gint prefs_matcher_not_criteria(gint matcher_criteria)
 {
        switch(matcher_criteria) {
@@ -867,6 +996,12 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_REPLIED;
        case MATCHCRITERIA_FORWARDED:
                return MATCHCRITERIA_NOT_FORWARDED;
+       case MATCHCRITERIA_LOCKED:
+               return MATCHCRITERIA_NOT_LOCKED;
+       case MATCHCRITERIA_COLORLABEL:
+               return MATCHCRITERIA_NOT_COLORLABEL;
+       case MATCHCRITERIA_IGNORE_THREAD:
+               return MATCHCRITERIA_NOT_IGNORE_THREAD;
        case MATCHCRITERIA_SUBJECT:
                return MATCHCRITERIA_NOT_SUBJECT;
        case MATCHCRITERIA_FROM:
@@ -898,9 +1033,15 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
        }
 }
 
-static MatcherProp * prefs_matcher_dialog_to_matcher()
+/*!
+ *\brief       Converts the text in the selected row to a 
+ *             matcher structure
+ *
+ *\return      MatcherProp * Newly allocated matcher structure.
+ */
+static MatcherProp *prefs_matcher_dialog_to_matcher(void)
 {
-       MatcherProp * matcherprop;
+       MatcherProp *matcherprop;
        gint criteria;
        gint matchtype;
        gint value_pred;
@@ -908,10 +1049,10 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        gint value_criteria;
        gboolean use_regexp;
        gboolean case_sensitive;
-       gchar * header;
-       gchar * expr;
+       gchar *header;
+       gchar *expr;
        gint value;
-       gchar * value_str;
+       gchar *value_str;
 
        value_criteria = get_sel_from_list(GTK_LIST(matcher.criteria_list));
 
@@ -930,7 +1071,10 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        case CRITERIA_DELETED:
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
+       case CRITERIA_LOCKED:
        case CRITERIA_EXECUTE:
+       case CRITERIA_COLORLABEL:
+       case CRITERIA_IGNORE_THREAD:
                if (value_pred_flag == PREDICATE_FLAG_DISABLED)
                        criteria = prefs_matcher_not_criteria(criteria);
                break;
@@ -978,6 +1122,8 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        case CRITERIA_DELETED:
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
+       case CRITERIA_LOCKED:
+       case CRITERIA_IGNORE_THREAD:
                break;
 
        case CRITERIA_SUBJECT:
@@ -1013,6 +1159,12 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
                value = atoi(value_str);
 
                break;
+               
+       case CRITERIA_COLORLABEL:
+               value = colorlabel_get_color_menu_active_item
+                       (gtk_option_menu_get_menu(GTK_OPTION_MENU
+                               (matcher.color_optmenu))); 
+               break;
 
        case CRITERIA_HEADER:
 
@@ -1026,15 +1178,18 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
                break;
        }
 
-       matcherprop =  matcherprop_new(criteria, header, matchtype,
-                                      expr, value);
+       matcherprop = matcherprop_new(criteria, header, matchtype,
+                                     expr, value);
 
        return matcherprop;
 }
 
+/*!
+ *\brief       Signal handler for register button
+ */
 static void prefs_matcher_register_cb(void)
 {
-       MatcherProp * matcherprop;
+       MatcherProp *matcherprop;
        
        matcherprop = prefs_matcher_dialog_to_matcher();
        if (matcherprop == NULL)
@@ -1048,12 +1203,16 @@ static void prefs_matcher_register_cb(void)
        prefs_matcher_update_hscrollbar();
 }
 
+/*!
+ *\brief       Signal handler for substitute button
+ */
 static void prefs_matcher_substitute_cb(void)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
        gint row;
-       MatcherProp * matcherprop;
+       MatcherProp *matcherprop;
 
+       if (!clist->selection) return;
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row == 0)
                return;
@@ -1071,6 +1230,9 @@ static void prefs_matcher_substitute_cb(void)
        prefs_matcher_update_hscrollbar();
 }
 
+/*!
+ *\brief       Signal handler for delete button
+ */
 static void prefs_matcher_delete_cb(void)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
@@ -1082,10 +1244,15 @@ static void prefs_matcher_delete_cb(void)
                return;
 
        gtk_clist_remove(clist, row);
-       
+
+       prefs_matcher_reset_condition();
+
        prefs_matcher_update_hscrollbar();
 }
 
+/*!
+ *\brief       Signal handler for 'move up' button
+ */
 static void prefs_matcher_up(void)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
@@ -1096,12 +1263,14 @@ static void prefs_matcher_up(void)
        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) {
+               if (gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL)
                        gtk_clist_moveto(clist, row - 1, 0, 0, 0);
-               } 
        }
 }
 
+/*!
+ *\brief       Signal handler for 'move down' button
+ */
 static void prefs_matcher_down(void)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
@@ -1112,17 +1281,24 @@ static void prefs_matcher_down(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row >= 1 && row < clist->rows - 1) {
                gtk_clist_row_move(clist, row, row + 1);
-               if(gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL) {
+               if (gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL)
                        gtk_clist_moveto(clist, row + 1, 0, 1, 0);
-               } 
        }
 }
 
+/*!
+ *\brief       Signal handler for select row.
+ *
+ *\param       clist List widget
+ *\param       row Selected row
+ *\param       column Selected column
+ *\param       event Event information
+ */
 static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
                                 GdkEvent *event)
 {
-       gchar * matcher_str;
-       MatcherProp * prop;
+       gchar *matcher_str;
+       MatcherProp *prop;
        gboolean negative_cond;
        gint criteria;
 
@@ -1137,7 +1313,6 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
                return;
        }
 
-       //      tmp = matcher_str;
        prop = matcher_parser_get_prop(matcher_str);
        if (prop == NULL)
                return;
@@ -1154,6 +1329,9 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
        case MATCHCRITERIA_NOT_DELETED:
        case MATCHCRITERIA_NOT_REPLIED:
        case MATCHCRITERIA_NOT_FORWARDED:
+       case MATCHCRITERIA_NOT_LOCKED:
+       case MATCHCRITERIA_NOT_COLORLABEL:
+       case MATCHCRITERIA_NOT_IGNORE_THREAD:
        case MATCHCRITERIA_NOT_SUBJECT:
        case MATCHCRITERIA_NOT_FROM:
        case MATCHCRITERIA_NOT_TO:
@@ -1210,6 +1388,12 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
                gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
                break;
 
+       case MATCHCRITERIA_NOT_COLORLABEL:
+       case MATCHCRITERIA_COLORLABEL:
+               gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu),
+                                           prop->value);
+               break;
+
        case MATCHCRITERIA_NOT_HEADER:
        case MATCHCRITERIA_HEADER:
                gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), prop->header);
@@ -1245,13 +1429,56 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
        }
 }
 
+/*!
+ *\brief       Helper function that allows us to replace the 'Value' entry box
+ *             by another widget.
+ *
+ *\param       old_widget Widget that needs to be removed.
+ *\param       new_widget Replacement widget
+ */
+static void prefs_matcher_set_value_widget(GtkWidget *old_widget, 
+                                          GtkWidget *new_widget)
+{
+       /* TODO: find out why the following spews harmless "parent errors" */
+
+       /* NOTE: we first need to bump up the refcount of the old_widget,
+        * because the gtkut_container_remove() will otherwise destroy it */
+       gtk_widget_ref(old_widget);
+       gtkut_container_remove(GTK_CONTAINER(matcher.criteria_table), old_widget);
+       gtk_widget_show(new_widget);
+       gtk_widget_set_usize(new_widget, 200, -1);
+       gtk_table_attach(GTK_TABLE(matcher.criteria_table), new_widget, 
+                        2, 3, 1, 2, 
+                        GTK_FILL | GTK_SHRINK | GTK_EXPAND, 
+                        0, 0, 0);
+}
+
+/*!
+ *\brief       Change widgets depending on the selected condition
+ *
+ *\param       list List widget
+ *\param       widget Not used
+ *\param       user_data Not used      
+ */
 static void prefs_matcher_criteria_select(GtkList *list,
                                          GtkWidget *widget,
                                          gpointer user_data)
 {
-       gint value;
+       gint value, old_value;
 
-       value = get_sel_from_list(GTK_LIST(matcher.criteria_list));
+       old_value = matcher.selected_criteria;
+       matcher.selected_criteria = value = get_sel_from_list
+               (GTK_LIST(matcher.criteria_list));
+       
+       /* CLAWS: the value widget is currently either the color label combo box,
+        * or a GtkEntry, so kiss for now */
+       if (matcher.selected_criteria == CRITERIA_COLORLABEL) { 
+               prefs_matcher_set_value_widget(matcher.value_entry, 
+                                              matcher.color_optmenu);
+       } else if (old_value == CRITERIA_COLORLABEL) {
+               prefs_matcher_set_value_widget(matcher.color_optmenu,
+                                              matcher.value_entry);
+       }                                              
 
        switch (value) {
        case CRITERIA_ALL:
@@ -1275,6 +1502,8 @@ static void prefs_matcher_criteria_select(GtkList *list,
        case CRITERIA_DELETED:
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
+       case CRITERIA_LOCKED:
+       case CRITERIA_IGNORE_THREAD:
                gtk_widget_set_sensitive(matcher.header_combo, FALSE);
                gtk_widget_set_sensitive(matcher.header_label, FALSE);
                gtk_widget_set_sensitive(matcher.value_label, FALSE);
@@ -1288,6 +1517,20 @@ static void prefs_matcher_criteria_select(GtkList *list,
                gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
                gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
                break;
+               
+       case CRITERIA_COLORLABEL:
+               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
+               gtk_widget_set_sensitive(matcher.header_label, FALSE);
+               gtk_widget_set_sensitive(matcher.value_label, TRUE);
+               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
+               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
+               gtk_widget_set_sensitive(matcher.predicate_flag_combo, TRUE);
+               gtk_widget_hide(matcher.predicate_combo);
+               gtk_widget_show(matcher.predicate_flag_combo);
+               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
+               break;
 
        case CRITERIA_SUBJECT:
        case CRITERIA_FROM:
@@ -1368,6 +1611,13 @@ static void prefs_matcher_criteria_select(GtkList *list,
        }
 }
 
+/*!
+ *\brief       Handle key press
+ *
+ *\param       widget Widget receiving key press
+ *\param       event Key event
+ *\param       data User data
+ */
 static void prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
@@ -1375,26 +1625,71 @@ static void prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
                prefs_matcher_cancel();
 }
 
+/*!
+ *\brief       Cancel matcher dialog
+ */
 static void prefs_matcher_cancel(void)
 {
        gtk_widget_hide(matcher.window);
        inc_unlock();
 }
 
+/*!
+ *\brief       Accept current matchers
+ */
 static void prefs_matcher_ok(void)
 {
-       MatcherList * matchers;
+       MatcherList *matchers;
+       MatcherProp *matcherprop;
+       AlertValue val;
+       gint criteria;
+       gint value_criteria;
+       gchar *matcher_str;
+       gchar *str;
+       gint row = 1;
 
        matchers = prefs_matcher_get_list();
-       gtk_widget_hide(matcher.window);
-       inc_unlock();
+
        if (matchers != NULL) {
+               matcherprop = prefs_matcher_dialog_to_matcher();
+               if (matcherprop != NULL) {
+                       str = matcherprop_to_string(matcherprop);
+                       if(strcmp(str, "all") != 0) {
+                               while (gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
+                                                 row, 0, &matcher_str)) {
+                                       if (strcmp(matcher_str, str) == 0) break;
+                                       row++;
+                               }
+
+                               if (strcmp(matcher_str, str) != 0) {
+                                       val = alertpanel(_("Entry not saved"),
+                                                        _("The entry was not saved\nHave you really finished?"),
+                                                        _("Yes"), _("No"), NULL);
+                                       if (G_ALERTDEFAULT != val) {
+                                               g_free(str);
+                                               return;
+                                       }
+                               }
+                       }
+               }
+                g_free(str);
+               gtk_widget_hide(matcher.window);
+               inc_unlock();
                if (matchers_callback != NULL)
                        matchers_callback(matchers);
                matcherlist_free(matchers);
        }
 }
 
+/*!
+ *\brief       Called when closing dialog box
+ *
+ *\param       widget Dialog widget
+ *\param       event Event info
+ *\param       data User data
+ *
+ *\return      gint TRUE
+ */
 static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
                                  gpointer data)
 {
@@ -1402,88 +1697,42 @@ static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
        return TRUE;
 }
 
-static GtkWidget * exec_info_win;
-
-void prefs_matcher_exec_info(void)
-{
-       if (!exec_info_win)
-               prefs_matcher_exec_info_create();
-
-       gtk_widget_show(exec_info_win);
-       gtk_main();
-       gtk_widget_hide(exec_info_win);
-}
-
-static void prefs_matcher_exec_info_create(void)
-{
-       GtkWidget *vbox;
-       GtkWidget *hbox;
-       GtkWidget *hbbox;
-       GtkWidget *label;
-       GtkWidget *ok_btn;
+/*
+ * Strings describing exec format strings
+ * 
+ * When adding new lines, remember to put 2 strings for each line
+ */
+static gchar *exec_desc_strings[] = {
+       "%%",   "%",
+       "%s",   N_("Subject"),
+       "%f",   N_("From"),
+       "%t",   N_("To"),
+       "%c",   N_("Cc"),
+       "%d",   N_("Date"),
+       "%i",   N_("Message-ID"),
+       "%n",   N_("Newsgroups"),
+       "%r",   N_("References"),
+       "%F",   N_("Filename - should not be modified"),
+       "\\n",  N_("new line"),
+       "\\",   N_("escape character for quotes"),
+       "\\\"",N_("quote character"),
+       NULL, NULL
+};
 
-       exec_info_win = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_window_set_title(GTK_WINDOW(exec_info_win),
-                            _("Description of symbols"));
-       gtk_container_set_border_width(GTK_CONTAINER(exec_info_win), 8);
-       gtk_window_set_position(GTK_WINDOW(exec_info_win), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(exec_info_win), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(exec_info_win), FALSE, TRUE, FALSE);
-
-       vbox = gtk_vbox_new(FALSE, 8);
-       gtk_container_add(GTK_CONTAINER(exec_info_win), vbox);
-
-       hbox = gtk_hbox_new(FALSE, 4);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-
-       label = gtk_label_new
-               ("%%:\n"
-                "%s:\n"
-                "%f:\n"
-                "%t:\n"
-                "%c:\n"
-                "%d:\n"
-                "%i:\n"
-                "%n:\n"
-                "%r:\n"
-                "%F:\n"
-                "\\n:\n"
-                "\\:\n"
-                "\\\":\n"
-                "%%:");
-
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-
-       label = gtk_label_new
-               (_("%\n"
-                  "Subject\n"
-                  "From\n"
-                  "To\n"
-                  "Cc\n"
-                  "Date\n"
-                  "Message-ID\n"
-                  "Newsgroups\n"
-                  "References\n"
-                  "Filename - should not be modified\n"
-                  "new line\n"
-                  "escape character for quotes\n"
-                  "quote character\n"
-                  "%"));
-
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-
-       gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
-                               NULL, NULL, NULL, NULL);
-       gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
+static DescriptionWindow exec_desc_win = { 
+        NULL, 
+        2,
+        N_("Description of symbols"),
+        exec_desc_strings
+};
 
-       gtk_widget_grab_default(ok_btn);
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                                 GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
 
-       gtk_signal_connect(GTK_OBJECT(exec_info_win), "delete_event",
-                                         GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
 
-       gtk_widget_show_all(vbox);
+/*!
+ *\brief       Show Execute action's info
+ */
+void prefs_matcher_exec_info(void)
+{
+       description_window_create(&exec_desc_win);
 }
+