diff options
| -rw-r--r-- | filter/ChangeLog | 7 | ||||
| -rw-r--r-- | filter/filter-label.c | 8 | ||||
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/filtertypes.xml | 5 |
4 files changed, 24 insertions, 2 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index bb54d81a2c..adc477e403 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,10 @@ +2007-09-12 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #231178 + + * filter-label.c: (xml_create): + Removes underscores from titles. + 2007-09-03 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #471791 (Move away from asserts to g_ret*) diff --git a/filter/filter-label.c b/filter/filter-label.c index 7e98f2f05f..4d997e7378 100644 --- a/filter/filter-label.c +++ b/filter/filter-label.c @@ -37,6 +37,7 @@ #include "filter-label.h" #include <libedataserver/e-sexp.h> +#include "e-util/e-util.h" #define d(x) @@ -157,7 +158,7 @@ xml_create (FilterElement *fe, xmlNodePtr node) FilterOption *fo = (FilterOption *) fe; GConfClient *gconf; GSList *list, *l; - char *title, *p; + char *title, *p, *nounderscores_title; int i = 0; FILTER_ELEMENT_CLASS (parent_class)->xml_create (fe, node); @@ -170,8 +171,11 @@ xml_create (FilterElement *fe, xmlNodePtr node) if ((p = strrchr (title, ':'))) *p++ = '\0'; - filter_option_add (fo, i < 5 ? labels[i++].value : (p ? p : "#ffffff"), title, NULL); + nounderscores_title = e_str_without_underscores (title); + + filter_option_add (fo, i < 5 ? labels[i++].value : (p ? p : "#ffffff"), nounderscores_title, NULL); g_free (title); + g_free (nounderscores_title); l = l->next; } diff --git a/mail/ChangeLog b/mail/ChangeLog index 4230b241a1..774175b9a8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2007-09-12 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #231178 + + * filtertypes.xml: Added 'label' filtertype to the list. + 2007-09-07 Johnny Jacob <jjohnny@novell.com> ** Partial Fix for #467581. diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml index b10cf182ad..e7571fc665 100644 --- a/mail/filtertypes.xml +++ b/mail/filtertypes.xml @@ -681,6 +681,11 @@ <title>Stop Processing</title> <code>(stop)</code> </part> + <part name="label"> + <title>Set Label</title> + <code>(set-label ${label})</code> + <input type="label" name="label"/> + </part> <part name="colour"> <title>Assign Color</title> <code>(set-colour ${colour})</code> |