2005-08-22 [paul] 1.9.13cvs50

	* src/filtering.c
	* src/filtering.h
	* src/matcher.c
	* src/matcher_parser_lex.l
	* src/matcher_parser_parse.y
	* src/prefs_filtering.c
		add Filtering/Processing rule names feature.
		(the incompatible old matcherrc is saved as
		matcherrc.pre_names).
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 95fce7b6b3e73ade5649cdbf5d031b9eb7753289..44ba3e2b8a335217bda782145a5523f4bb749833 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,16 @@
+2005-08-22 [paul]      1.9.13cvs50
+
+       * src/filtering.c
+       * src/filtering.h
+       * src/matcher.c
+       * src/matcher_parser_lex.l
+       * src/matcher_parser_parse.y
+       * src/prefs_filtering.c
+               add Filtering/Processing rule names feature.
+               (the incompatible old matcherrc is saved as
+               matcherrc.pre_names).
+               Patch by Colin
+

 2005-08-22 [paul]      1.9.13cvs49
 
        * src/procmsg.c
 2005-08-22 [paul]      1.9.13cvs49
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index 8fc4ec866a3213f6f232ee18c44d33240f6470a0..f67856170cbd429aa001d637ab0d512d5d7087c0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -735,3 +735,4 @@
 ( cvs diff -u -r 1.179.2.58 -r 1.179.2.59 src/imap.c;  ) > 1.9.13cvs47.patchset
 ( cvs diff -u -r 1.96.2.71 -r 1.96.2.72 src/textview.c;  ) > 1.9.13cvs48.patchset
 ( cvs diff -u -r 1.150.2.39 -r 1.150.2.40 src/procmsg.c;  ) > 1.9.13cvs49.patchset
 ( cvs diff -u -r 1.179.2.58 -r 1.179.2.59 src/imap.c;  ) > 1.9.13cvs47.patchset
 ( cvs diff -u -r 1.96.2.71 -r 1.96.2.72 src/textview.c;  ) > 1.9.13cvs48.patchset
 ( cvs diff -u -r 1.150.2.39 -r 1.150.2.40 src/procmsg.c;  ) > 1.9.13cvs49.patchset

+( cvs diff -u -r 1.60.2.6 -r 1.60.2.7 src/filtering.c;  cvs diff -u -r 1.21.2.1 -r 1.21.2.2 src/filtering.h;  cvs diff -u -r 1.75.2.8 -r 1.75.2.9 src/matcher.c;  cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/matcher_parser_lex.l;  cvs diff -u -r 1.25.2.8 -r 1.25.2.9 src/matcher_parser_parse.y;  cvs diff -u -r 1.59.2.22 -r 1.59.2.23 src/prefs_filtering.c;  ) > 1.9.13cvs50.patchset

diff --git a/configure.ac b/configure.ac
index 299fd7dfde35500f38883c25f473e3e0a4c94f54..d64a4adfea6bc16f8245ea3654ffc04052125ce8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=49
+EXTRA_VERSION=50

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index a6ff6661e912e38469ad8cf97c13263891301e44..8b6799b6f44b523eabffac523284fb826169f8f2 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -83,12 +83,14 @@ void filteringaction_free(FilteringAction * action)
        g_free(action);
 }
 
        g_free(action);
 }
 

-FilteringProp * filteringprop_new(MatcherList * matchers,
+FilteringProp * filteringprop_new(const gchar *name,
+                                 MatcherList * matchers,

                                  GSList * action_list)
 {
        FilteringProp * filtering;
 
        filtering = g_new0(FilteringProp, 1);
                                  GSList * action_list)
 {
        FilteringProp * filtering;
 
        filtering = g_new0(FilteringProp, 1);

+       filtering->name = name ? g_strdup(name): NULL;

        filtering->matchers = matchers;
        filtering->action_list = action_list;
 
        filtering->matchers = matchers;
        filtering->action_list = action_list;
 


@@ -142,6 +144,8 @@ FilteringProp * filteringprop_copy(FilteringProp *src)
                     filteringaction_copy(filtering_action));
         }
 
                     filteringaction_copy(filtering_action));
         }
 

+       new->name = g_strdup(src->name);
+

        return new;
 }
 
        return new;
 }
 


@@ -155,6 +159,7 @@ void filteringprop_free(FilteringProp * prop)
         for (tmp = prop->action_list ; tmp != NULL ; tmp = tmp->next) {
                 filteringaction_free(tmp->data);
         }
         for (tmp = prop->action_list ; tmp != NULL ; tmp = tmp->next) {
                 filteringaction_free(tmp->data);
         }

+       g_free(prop->name);

        g_free(prop);
 }
 
        g_free(prop);
 }
 

diff --git a/src/filtering.h b/src/filtering.h
index f604686c4073ffa91c7e83d219bc3045859bdb7d..e6e3d98be906bdd68f2d6406132a2436a5f11123 100644 (file)
--- a/src/filtering.h
+++ b/src/filtering.h
@@ -36,6 +36,7 @@ struct _FilteringAction {
 typedef struct _FilteringAction FilteringAction;
 
 struct _FilteringProp {
 typedef struct _FilteringAction FilteringAction;
 
 struct _FilteringProp {

+       gchar *name;

        MatcherList * matchers;
        GSList * action_list;
 };
        MatcherList * matchers;
        GSList * action_list;
 };


@@ -52,7 +53,8 @@ void filteringaction_free(FilteringAction *action);
 FilteringAction * filteringaction_parse(gchar **str);
 gboolean filteringaction_apply_action_list (GSList *action_list, MsgInfo *info);
 
 FilteringAction * filteringaction_parse(gchar **str);
 gboolean filteringaction_apply_action_list (GSList *action_list, MsgInfo *info);
 

-FilteringProp * filteringprop_new(MatcherList *matchers,
+FilteringProp * filteringprop_new(const gchar *name,
+                                 MatcherList *matchers,

                                  GSList *action_list);
 void filteringprop_free(FilteringProp *prop);
 
                                  GSList *action_list);
 void filteringprop_free(FilteringProp *prop);
 

diff --git a/src/matcher.c b/src/matcher.c
index 5cb0620fa6965d4a1161e76d6ff25138b49bba25..2652313cb4ead9ce2e6390e61354bb7f74891a0f 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1384,6 +1384,7 @@ static void prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
 
        for (cur = prefs_filtering; cur != NULL; cur = cur->next) {
                gchar *filtering_str;
 
        for (cur = prefs_filtering; cur != NULL; cur = cur->next) {
                gchar *filtering_str;

+               gchar *tmp_name = NULL;

                FilteringProp *prop;
 
                if (NULL == (prop = (FilteringProp *) cur->data))
                FilteringProp *prop;
 
                if (NULL == (prop = (FilteringProp *) cur->data))


@@ -1391,8 +1392,32 @@ static void prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
                
                if (NULL == (filtering_str = filteringprop_to_string(prop)))
                        continue;
                
                if (NULL == (filtering_str = filteringprop_to_string(prop)))
                        continue;

-               
-               if (fputs(filtering_str, fp) == EOF ||
+                               
+               if (fputs("rulename \"", fp) == EOF) {
+                       FILE_OP_ERROR("filtering config", "fputs || fputc");
+                       g_free(filtering_str);
+                       return;
+               }
+               tmp_name = prop->name;
+               while (tmp_name && *tmp_name != '\0') {
+                       if (*tmp_name != '"') {
+                               if (fputc(*tmp_name, fp) == EOF) {
+                                       FILE_OP_ERROR("filtering config", "fputc");
+                                       g_free(filtering_str);
+                                       return;
+                               }
+                       } else if (*tmp_name == '"') {
+                               if (fputc('\\', fp) == EOF ||
+                                   fputc('"', fp) == EOF) {
+                                       FILE_OP_ERROR("filtering config", "fputc");
+                                       g_free(filtering_str);
+                                       return;
+                               }
+                       }
+                       tmp_name ++;
+               }
+               if(fputs("\" ", fp) == EOF ||
+                   fputs(filtering_str, fp) == EOF ||

                    fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR("filtering config", "fputs || fputc");
                        g_free(filtering_str);
                    fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR("filtering config", "fputs || fputc");
                        g_free(filtering_str);


@@ -1502,18 +1527,56 @@ void prefs_matcher_write_config(void)
 
 /* ******************************************************************* */
 
 
 /* ******************************************************************* */
 

+void matcher_add_rulenames(const gchar *rcpath)
+{
+       gchar *newpath = g_strconcat(rcpath, ".new", NULL);
+       FILE *src = g_fopen(rcpath, "rb");
+       FILE *dst = g_fopen(newpath, "wb");
+       gchar buf[BUFFSIZE];
+
+       if (dst == NULL) {
+               perror("fopen");
+               g_free(newpath);
+               return;
+       }
+
+       while (fgets (buf, sizeof(buf), src) != NULL) {
+               if (strlen(buf) > 2 && buf[0] != '['
+               && strncmp(buf, "rulename \"", 10)) {
+                       fwrite("rulename \"\" ",
+                               strlen("rulename \"\" "), 1, dst);
+               }
+               fwrite(buf, strlen(buf), 1, dst);
+       }
+       fclose(dst);
+       fclose(src);
+       move_file(newpath, rcpath, TRUE);
+       g_free(newpath);
+}
+

 /*!
  *\brief       Read matcher configuration
  */
 void prefs_matcher_read_config(void)
 {
        gchar *rcpath;
 /*!
  *\brief       Read matcher configuration
  */
 void prefs_matcher_read_config(void)
 {
        gchar *rcpath;

+       gchar *rc_old_format;

        FILE *f;
 
        create_matchparser_hashtab();
        prefs_filtering_clear();
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MATCHER_RC, NULL);
        FILE *f;
 
        create_matchparser_hashtab();
        prefs_filtering_clear();
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MATCHER_RC, NULL);

+       rc_old_format = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MATCHER_RC, 
+                               ".pre_names", NULL);
+       
+       if (!is_file_exist(rc_old_format) && is_file_exist(rcpath)) {
+               /* backup file with no rules names, in case 
+                * anything goes wrong */
+               copy_file(rcpath, rc_old_format, FALSE);
+               /* now hack the file in order to have it to the new format */
+               matcher_add_rulenames(rcpath);
+       }

        f = g_fopen(rcpath, "rb");
        g_free(rcpath);
 
        f = g_fopen(rcpath, "rb");
        g_free(rcpath);
 

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index 8e1bacb8e531fcd63f917ecedbe9f5b67e8e6eba..cd2b75a5f9e6bb586a2c943cf9e9c2e9dbdd6fea 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -24,8 +24,9 @@
 #include "codeconv.h"
 #include "matcher.h"
 #include "matcher_parser_lex.h"
 #include "codeconv.h"
 #include "matcher.h"
 #include "matcher_parser_lex.h"

+#ifndef YYSTYPE

 #include "matcher_parser_parse.h"
 #include "matcher_parser_parse.h"

-
+#endif

 #define MAX_STR_CONST 512
 #define YY_NO_UNPUT 1
 
 #define MAX_STR_CONST 512
 #define YY_NO_UNPUT 1
 


@@ -109,5 +110,8 @@ void matcher_parser_init(void)
                yylval.str = yytext;
                return MATCHER_INTEGER;
                }
                yylval.str = yytext;
                return MATCHER_INTEGER;
                }

+rulename       {
+               return MATCHER_RULENAME;
+               }

 
 %%
 
 %%

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index abe5b2ab1b3b927eb61117d02d3f51b4a4242a4f..39997d953e70883107e98ca899b95f89f9a467c8 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -43,6 +43,7 @@ static MatcherProp *prop;
 
 static GSList *matchers_list = NULL;
 
 
 static GSList *matchers_list = NULL;
 

+static gchar *name = NULL;

 static MatcherList *cond;
 static GSList *action_list = NULL;
 static FilteringAction *action = NULL;
 static MatcherList *cond;
 static GSList *action_list = NULL;
 static FilteringAction *action = NULL;


@@ -55,6 +56,7 @@ static int enable_compatibility = 0;
 enum {
         MATCHER_PARSE_FILE,
         MATCHER_PARSE_NO_EOL,
 enum {
         MATCHER_PARSE_FILE,
         MATCHER_PARSE_NO_EOL,

+       MATCHER_PARSE_NAME,

         MATCHER_PARSE_CONDITION,
         MATCHER_PARSE_FILTERING_ACTION,
 };
         MATCHER_PARSE_CONDITION,
         MATCHER_PARSE_FILTERING_ACTION,
 };


@@ -76,6 +78,13 @@ void * matcher_parser_scan_string(const char * str);
 FilteringProp *matcher_parser_get_filtering(gchar *str)
 {
        void *bufstate;
 FilteringProp *matcher_parser_get_filtering(gchar *str)
 {
        void *bufstate;

+       void *tmp_str = NULL;
+       
+       /* little hack to allow passing rules with no names */
+       if (!strncmp(str, "rulename ", 9))
+               tmp_str = g_strdup(str);
+       else 
+               tmp_str = g_strconcat("rulename \"\" ", str, NULL);

 
        /* bad coding to enable the sub-grammar matching
           in yacc */
 
        /* bad coding to enable the sub-grammar matching
           in yacc */


@@ -83,12 +92,13 @@ FilteringProp *matcher_parser_get_filtering(gchar *str)
        matcher_parse_op = MATCHER_PARSE_NO_EOL;
        matcher_parserrestart(NULL);
         matcher_parser_init();
        matcher_parse_op = MATCHER_PARSE_NO_EOL;
        matcher_parserrestart(NULL);
         matcher_parser_init();

-       bufstate = matcher_parser_scan_string((const char *) str);
+       bufstate = matcher_parser_scan_string((const char *) tmp_str);

         matcher_parser_switch_to_buffer(bufstate);
        if (matcher_parserparse() != 0)
                filtering = NULL;
        matcher_parse_op = MATCHER_PARSE_FILE;
        matcher_parser_delete_buffer(bufstate);
         matcher_parser_switch_to_buffer(bufstate);
        if (matcher_parserparse() != 0)
                filtering = NULL;
        matcher_parse_op = MATCHER_PARSE_FILE;
        matcher_parser_delete_buffer(bufstate);

+       g_free(tmp_str);

        return filtering;
 }
 
        return filtering;
 }
 


@@ -111,6 +121,28 @@ static gboolean check_quote_symetry(gchar *str)
        return !(ret % 2);
 }
 
        return !(ret % 2);
 }
 

+MatcherList *matcher_parser_get_name(gchar *str)
+{
+       void *bufstate;
+
+       if (!check_quote_symetry(str)) {
+               cond = NULL;
+               return cond;
+       }
+       
+       /* bad coding to enable the sub-grammar matching
+          in yacc */
+       matcher_parserlineno = 1;
+       matcher_parse_op = MATCHER_PARSE_NAME;
+       matcher_parserrestart(NULL);
+        matcher_parser_init();
+       bufstate = matcher_parser_scan_string(str);
+       matcher_parserparse();
+       matcher_parse_op = MATCHER_PARSE_FILE;
+       matcher_parser_delete_buffer(bufstate);
+       return cond;
+}
+

 MatcherList *matcher_parser_get_cond(gchar *str)
 {
        void *bufstate;
 MatcherList *matcher_parser_get_cond(gchar *str)
 {
        void *bufstate;


@@ -208,7 +240,6 @@ int matcher_parserwrap(void)
        char *str;
        int value;
 }
        char *str;
        int value;
 }

-

 %token MATCHER_ALL MATCHER_UNREAD  MATCHER_NOT_UNREAD 
 %token MATCHER_NEW  MATCHER_NOT_NEW  MATCHER_MARKED
 %token MATCHER_NOT_MARKED  MATCHER_DELETED  MATCHER_NOT_DELETED
 %token MATCHER_ALL MATCHER_UNREAD  MATCHER_NOT_UNREAD 
 %token MATCHER_NEW  MATCHER_NOT_NEW  MATCHER_MARKED
 %token MATCHER_NOT_MARKED  MATCHER_DELETED  MATCHER_NOT_DELETED


@@ -242,6 +273,7 @@ int matcher_parserwrap(void)
 
 %start file
 
 
 %start file
 

+%token MATCHER_RULENAME

 %token <str> MATCHER_STRING
 %token <str> MATCHER_SECTION
 %token <str> MATCHER_INTEGER
 %token <str> MATCHER_STRING
 %token <str> MATCHER_SECTION
 %token <str> MATCHER_INTEGER


@@ -306,13 +338,22 @@ MATCHER_SECTION MATCHER_EOL
 ;
 
 instruction:
 ;
 
 instruction:

-condition filtering MATCHER_EOL
-| condition filtering
+name condition filtering MATCHER_EOL
+| name condition filtering

 {
        if (matcher_parse_op == MATCHER_PARSE_NO_EOL)
                YYACCEPT;
        else {
 {
        if (matcher_parse_op == MATCHER_PARSE_NO_EOL)
                YYACCEPT;
        else {

-               matcher_parsererror("parse error");
+               matcher_parsererror("parse error a");
+               YYERROR;
+       }
+}
+| name
+{
+       if (matcher_parse_op == MATCHER_PARSE_NAME)
+               YYACCEPT;
+       else {
+               matcher_parsererror("parse error b");

                YYERROR;
        }
 }
                YYERROR;
        }
 }


@@ -321,7 +362,7 @@ condition filtering MATCHER_EOL
        if (matcher_parse_op == MATCHER_PARSE_CONDITION)
                YYACCEPT;
        else {
        if (matcher_parse_op == MATCHER_PARSE_CONDITION)
                YYACCEPT;
        else {

-               matcher_parsererror("parse error");
+               matcher_parsererror("parse error c");

                YYERROR;
        }
 }
                YYERROR;
        }
 }


@@ -330,18 +371,25 @@ condition filtering MATCHER_EOL
        if (matcher_parse_op == MATCHER_PARSE_FILTERING_ACTION)
                YYACCEPT;
        else {
        if (matcher_parse_op == MATCHER_PARSE_FILTERING_ACTION)
                YYACCEPT;
        else {

-               matcher_parsererror("parse error");
+               matcher_parsererror("parse error d");

                YYERROR;
        }
 }
 | MATCHER_EOL
 ;
 
                YYERROR;
        }
 }
 | MATCHER_EOL
 ;
 

+name:
+MATCHER_RULENAME MATCHER_STRING
+{
+       name = g_strdup($2);
+}
+

 filtering:
 filtering_action_list
 {
 filtering:
 filtering_action_list
 {

-       filtering = filteringprop_new(cond, action_list);
-        
+       filtering = filteringprop_new(name, cond, action_list);
+        g_free(name);
+       name = NULL;

         if (enable_compatibility) {
                 prefs_filtering = &filtering_rules;
                 if (action_list != NULL) {
         if (enable_compatibility) {
                 prefs_filtering = &filtering_rules;
                 if (action_list != NULL) {

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 9bc2db026726fe13640b1329fdd659e2e971d953..92e491c414640bebc13ee88fdaed7210013e0f2a 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -55,6 +55,7 @@
 #include "prefs_filtering_action.h"
 
 enum {
 #include "prefs_filtering_action.h"
 
 enum {

+       PREFS_FILTERING_NAME,

        PREFS_FILTERING_RULE,
        PREFS_FILTERING_PROP,
        N_PREFS_FILTERING_COLUMNS
        PREFS_FILTERING_RULE,
        PREFS_FILTERING_PROP,
        N_PREFS_FILTERING_COLUMNS


@@ -64,6 +65,7 @@ static struct Filtering {
        GtkWidget *window;
 
        GtkWidget *ok_btn;
        GtkWidget *window;
 
        GtkWidget *ok_btn;

+       GtkWidget *name_entry;

        GtkWidget *cond_entry;
        GtkWidget *action_entry;
 
        GtkWidget *cond_entry;
        GtkWidget *action_entry;
 


@@ -110,10 +112,13 @@ 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,
 static GtkListStore* prefs_filtering_create_data_store (void);
 static gint prefs_filtering_list_view_insert_rule      (GtkListStore *list_store,
                                                         gint row,

+                                                        const gchar *name, 

                                                         const gchar *rule, 
                                                         gboolean prop);
 static gchar *prefs_filtering_list_view_get_rule       (GtkWidget *list, 
                                                         gint row);
                                                         const gchar *rule, 
                                                         gboolean prop);
 static gchar *prefs_filtering_list_view_get_rule       (GtkWidget *list, 
                                                         gint row);

+static gchar *prefs_filtering_list_view_get_rule_name  (GtkWidget *list, 
+                                                        gint row);

 
 static GtkWidget *prefs_filtering_list_view_create     (void);
 static void prefs_filtering_create_list_view_columns   (GtkWidget *list_view);
 
 static GtkWidget *prefs_filtering_list_view_create     (void);
 static void prefs_filtering_create_list_view_columns   (GtkWidget *list_view);


@@ -185,11 +190,12 @@ static void prefs_filtering_create(void)
        GtkWidget *confirm_area;
 
        GtkWidget *vbox1;
        GtkWidget *confirm_area;
 
        GtkWidget *vbox1;

-       GtkWidget *hbox1;

        GtkWidget *reg_hbox;
        GtkWidget *arrow;
        GtkWidget *btn_hbox;
 
        GtkWidget *reg_hbox;
        GtkWidget *arrow;
        GtkWidget *btn_hbox;
 

+       GtkWidget *name_label;
+       GtkWidget *name_entry;

        GtkWidget *cond_label;
        GtkWidget *cond_entry;
        GtkWidget *cond_btn;
        GtkWidget *cond_label;
        GtkWidget *cond_entry;
        GtkWidget *cond_btn;


@@ -211,6 +217,7 @@ static void prefs_filtering_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
        GtkWidget *bottom_btn;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
        GtkWidget *bottom_btn;

+       GtkWidget *table;

        static GdkGeometry geometry;
 
        debug_print("Creating filtering configuration window...\n");
        static GdkGeometry geometry;
 
        debug_print("Creating filtering configuration window...\n");


@@ -248,53 +255,72 @@ static void prefs_filtering_create(void)
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
 
        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);
 
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
 

-       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);
+       table = gtk_table_new(3, 3, FALSE);
+       gtk_widget_show(table);
+       gtk_box_pack_start (GTK_BOX (vbox1), table, TRUE, TRUE, 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);
+       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);
+
+       cond_label = gtk_label_new (_("Condition: "));
+       gtk_widget_show (cond_label);
+       gtk_misc_set_alignment (GTK_MISC (cond_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), cond_label, 0, 1, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);

 
        cond_entry = gtk_entry_new ();
        gtk_widget_show (cond_entry);
 
        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, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);

 
        cond_btn = gtk_button_new_with_label (_("Define ..."));
        gtk_widget_show (cond_btn);
 
        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_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 2, 2);

        g_signal_connect(G_OBJECT (cond_btn), "clicked",
                         G_CALLBACK(prefs_filtering_condition_define),
                         NULL);
 
        g_signal_connect(G_OBJECT (cond_btn), "clicked",
                         G_CALLBACK(prefs_filtering_condition_define),
                         NULL);
 

-       action_label = gtk_label_new (_("Action"));
+       action_label = gtk_label_new (_("Action: "));

        gtk_widget_show (action_label);
        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, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);

 
        action_entry = gtk_entry_new ();
        gtk_widget_show (action_entry);
 
        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, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);

 
        action_btn = gtk_button_new_with_label (_("Define ..."));
        gtk_widget_show (action_btn);
 
        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_table_attach (GTK_TABLE (table), action_btn, 2, 3, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 2, 2);

        g_signal_connect(G_OBJECT (action_btn), "clicked",
                         G_CALLBACK(prefs_filtering_action_define),
                         NULL);
        g_signal_connect(G_OBJECT (action_btn), "clicked",
                         G_CALLBACK(prefs_filtering_action_define),
                         NULL);

-
+                        

        /* register / substitute / delete */
        /* 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);
        reg_hbox = gtk_hbox_new (FALSE, 4);
        gtk_widget_show (reg_hbox);
        gtk_box_pack_start (GTK_BOX (vbox1), reg_hbox, FALSE, FALSE, 0);


@@ -329,7 +355,7 @@ static void prefs_filtering_create(void)
 
        cond_hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (cond_hbox);
 
        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);
 
        cond_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_show (cond_scrolledwin);


@@ -391,6 +417,7 @@ static void prefs_filtering_create(void)
        filtering.window    = window;
        filtering.ok_btn = ok_btn;
 
        filtering.window    = window;
        filtering.ok_btn = ok_btn;
 

+       filtering.name_entry     = name_entry;

        filtering.cond_entry     = cond_entry;
        filtering.action_entry   = action_entry;
        filtering.cond_list_view = cond_list_view;
        filtering.cond_entry     = cond_entry;
        filtering.action_entry   = action_entry;
        filtering.cond_list_view = cond_list_view;


@@ -617,6 +644,7 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 
        /* add the place holder (New) at row 0 */
        prefs_filtering_list_view_insert_rule(list_store, -1, 
 
        /* add the place holder (New) at row 0 */
        prefs_filtering_list_view_insert_rule(list_store, -1, 

+                                             _("(New)"),

                                              _("(New)"),
                                              FALSE);
 
                                              _("(New)"),
                                              FALSE);
 


@@ -629,6 +657,7 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
                subst_char(cond_str, '\t', ':');
 
                prefs_filtering_list_view_insert_rule(list_store, -1, 
                subst_char(cond_str, '\t', ':');
 
                prefs_filtering_list_view_insert_rule(list_store, -1, 

+                                                     prop->name,

                                                      cond_str, TRUE);
                
                g_free(cond_str);
                                                      cond_str, TRUE);
                
                g_free(cond_str);


@@ -653,6 +682,7 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 
 static void prefs_filtering_reset_dialog(void)
 {
 
 static void prefs_filtering_reset_dialog(void)
 {

+       gtk_entry_set_text(GTK_ENTRY(filtering.name_entry), "");

        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), "");
        gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), "");
 }
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), "");
        gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), "");
 }


@@ -677,11 +707,14 @@ static void prefs_filtering_set_list(void)
                /* FIXME: this strcmp() is bogus: "(New)" should never
                 * be inserted in the storage */
                if (strcmp(filtering_str, _("(New)")) != 0) {
                /* FIXME: this strcmp() is bogus: "(New)" should never
                 * be inserted in the storage */
                if (strcmp(filtering_str, _("(New)")) != 0) {

+                       gchar *name = prefs_filtering_list_view_get_rule_name(filtering.cond_list_view, row);

                        prop = matcher_parser_get_filtering(filtering_str);
                        g_free(filtering_str);
                        prop = matcher_parser_get_filtering(filtering_str);
                        g_free(filtering_str);

-                       if (prop) 
+                       if (prop) {
+                               prop->name = name;

                                prefs_filtering = 
                                        g_slist_append(prefs_filtering, prop);
                                prefs_filtering = 
                                        g_slist_append(prefs_filtering, prop);

+                       }

                }
                
                row++;
                }
                
                row++;


@@ -695,14 +728,18 @@ static gint prefs_filtering_list_view_set_row(gint row, FilteringProp * prop)
        GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
        gchar *str;
        GtkListStore *list_store;
        GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
        gchar *str;
        GtkListStore *list_store;

-
+       gchar *name = NULL;
+       

        str = filteringprop_to_string(prop);
        if (str == NULL)
                return -1;
        str = filteringprop_to_string(prop);
        if (str == NULL)
                return -1;

+       
+       if (prop && prop->name)
+               name = prop->name;

 
        list_store = GTK_LIST_STORE(gtk_tree_view_get_model(list_view));
 
 
        list_store = GTK_LIST_STORE(gtk_tree_view_get_model(list_view));
 

-       row = prefs_filtering_list_view_insert_rule(list_store, row, str, prop != NULL);
+       row = prefs_filtering_list_view_insert_rule(list_store, row, name, str, prop != NULL);

 
        g_free(str);
 
 
        g_free(str);
 


@@ -793,11 +830,14 @@ static void prefs_filtering_action_define(void)
 static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
 {
        MatcherList * cond;
 static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
 {
        MatcherList * cond;

+       gchar * name = NULL;

        gchar * cond_str = NULL;
        gchar * action_str = NULL;
        FilteringProp * prop = NULL;
        GSList * action_list;
 
        gchar * cond_str = NULL;
        gchar * action_str = NULL;
        FilteringProp * prop = NULL;
        GSList * action_list;
 

+       name = gtk_editable_get_chars(GTK_EDITABLE(filtering.name_entry), 0, -1);
+       

        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."));
        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."));


@@ -825,9 +865,10 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
                goto fail;
        }
 
                goto fail;
        }
 

-       prop = filteringprop_new(cond, action_list);
+       prop = filteringprop_new(name, cond, action_list);

 
 fail:
 
 fail:

+       g_free(name);

        g_free(cond_str);
        g_free(action_str);
        return prop;
        g_free(cond_str);
        g_free(action_str);
        return prop;


@@ -978,6 +1019,9 @@ static void prefs_filtering_select_set(FilteringProp *prop)
        if (matcher_str == NULL) {
                return;
        }
        if (matcher_str == NULL) {
                return;
        }

+       
+       if (prop->name != NULL)
+               gtk_entry_set_text(GTK_ENTRY(filtering.name_entry), prop->name);

 
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), matcher_str);
 
 
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), matcher_str);
 


@@ -1059,6 +1103,7 @@ static void prefs_filtering_cancel(void)
 static GtkListStore* prefs_filtering_create_data_store(void)
 {
        return gtk_list_store_new(N_PREFS_FILTERING_COLUMNS,
 static GtkListStore* prefs_filtering_create_data_store(void)
 {
        return gtk_list_store_new(N_PREFS_FILTERING_COLUMNS,

+                                 G_TYPE_STRING,

                                  G_TYPE_STRING,
                                  G_TYPE_BOOLEAN,
                                 -1);
                                  G_TYPE_STRING,
                                  G_TYPE_BOOLEAN,
                                 -1);


@@ -1080,6 +1125,7 @@ static GtkListStore* prefs_filtering_create_data_store(void)
  */
 static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
                                                  gint row,
  */
 static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
                                                  gint row,

+                                                 const gchar *name,

                                                  const gchar *rule,
                                                  gboolean prop) 
 {
                                                  const gchar *rule,
                                                  gboolean prop) 
 {


@@ -1096,6 +1142,7 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
                /* append new */
                gtk_list_store_append(list_store, &iter);
                gtk_list_store_set(list_store, &iter, 
                /* append new */
                gtk_list_store_append(list_store, &iter);
                gtk_list_store_set(list_store, &iter, 

+                                  PREFS_FILTERING_NAME, name,

                                   PREFS_FILTERING_RULE, rule,
                                   PREFS_FILTERING_PROP, prop,
                                   -1);
                                   PREFS_FILTERING_RULE, rule,
                                   PREFS_FILTERING_PROP, prop,
                                   -1);


@@ -1104,6 +1151,7 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
        } else {
                /* change existing */
                gtk_list_store_set(list_store, &iter, 
        } else {
                /* change existing */
                gtk_list_store_set(list_store, &iter, 

+                                  PREFS_FILTERING_NAME, name,

                                   PREFS_FILTERING_RULE, rule,
                                   -1);
                return row;                                
                                   PREFS_FILTERING_RULE, rule,
                                   -1);
                return row;                                


@@ -1130,6 +1178,23 @@ static gchar *prefs_filtering_list_view_get_rule(GtkWidget *list, gint row)
        return result;
 }
 
        return result;
 }
 

+static gchar *prefs_filtering_list_view_get_rule_name(GtkWidget *list, gint row)
+{      
+       GtkTreeView *list_view = GTK_TREE_VIEW(list);
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       GtkTreeIter iter;
+       gchar *result = NULL;
+
+       if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
+               return NULL;
+       
+       gtk_tree_model_get(model, &iter, 
+                          PREFS_FILTERING_NAME, &result,
+                          -1);
+       
+       return result;
+}
+

 /*!
  *\brief       Create list view for filtering
  */
 /*!
  *\brief       Create list view for filtering
  */


@@ -1162,7 +1227,16 @@ static void prefs_filtering_create_list_view_columns(GtkWidget *list_view)
 
        renderer = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes
 
        renderer = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes

-               (_("Current filtering/processing rules"),
+               (_("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
+               (_("Rule"),

                 renderer,
                 "text", PREFS_FILTERING_RULE,
                 NULL);
                 renderer,
                 "text", PREFS_FILTERING_RULE,
                 NULL);


@@ -1259,17 +1333,22 @@ static gboolean prefs_filtering_selected(GtkTreeSelection *selector,
                if (has_prop) {
                        FilteringProp *prop;
                        gchar *filtering_str = NULL;
                if (has_prop) {
                        FilteringProp *prop;
                        gchar *filtering_str = NULL;

-                       
+                       gchar *name = NULL;
+

                        gtk_tree_model_get(model, &iter,
                                           PREFS_FILTERING_RULE, &filtering_str,
                                           -1);
                        gtk_tree_model_get(model, &iter,
                                           PREFS_FILTERING_RULE, &filtering_str,
                                           -1);

+                       gtk_tree_model_get(model, &iter,
+                                          PREFS_FILTERING_NAME, &name,
+                                          -1);

 
                        prop = matcher_parser_get_filtering(filtering_str);
                        if (prop) { 
 
                        prop = matcher_parser_get_filtering(filtering_str);
                        if (prop) { 

+                               prop->name = g_strdup(name);

                                prefs_filtering_select_set(prop);
                                filteringprop_free(prop);
                        }                               
                                prefs_filtering_select_set(prop);
                                filteringprop_free(prop);
                        }                               

-                       
+                       g_free(name);

                        g_free(filtering_str);
                } else
                        prefs_filtering_reset_dialog();
                        g_free(filtering_str);
                } else
                        prefs_filtering_reset_dialog();