diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-filter-i18n.h | 18 | ||||
| -rw-r--r-- | mail/filtertypes.xml | 8 | ||||
| -rw-r--r-- | mail/message-list.c | 2 | ||||
| -rw-r--r-- | mail/searchtypes.xml | 4 | ||||
| -rw-r--r-- | mail/vfoldertypes.xml | 4 |
6 files changed, 22 insertions, 23 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6856858007..98aeccdef7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2008-12-10 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #563870 + + * vfoldertypes.xml: + * filtertypes.xml: + * searchtypes.xml: Use dynamic filter option. + * message-list.c: Drop unused header include. + 2008-12-09 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #552583 diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h index 6c85661766..8b8d0c3323 100644 --- a/mail/em-filter-i18n.h +++ b/mail/em-filter-i18n.h @@ -1,19 +1,3 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - */ /* Automatically generated. Do not edit. */ char *s = N_("Adjust Score"); char *s = N_("Assign Color"); @@ -65,7 +49,6 @@ char *s = N_("Message is not Junk"); char *s = N_("Move to Folder"); char *s = N_("Pipe to Program"); char *s = N_("Play Sound"); -/* Translators: "Read" as in "has been read" (em-filter-i18n.h) */ char *s = N_("Read"); char *s = N_("Recipients"); char *s = N_("Regex Match"); @@ -76,6 +59,7 @@ char *s = N_("returns less than"); char *s = N_("Run Program"); char *s = N_("Score"); char *s = N_("Sender"); +char *s = N_("Sender or Recipients"); char *s = N_("Set Label"); char *s = N_("Set Status"); char *s = N_("Size (kB)"); diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml index 60702f2b08..69c1ddbaae 100644 --- a/mail/filtertypes.xml +++ b/mail/filtertypes.xml @@ -635,7 +635,9 @@ </code> </option> </input> - <input type="label" name="versus"/> + <input type="optionlist" name="versus"> + <dynamic func="e_util_labels_get_filter_options"/> + </input> </part> <part name="score"> @@ -920,7 +922,9 @@ <part name="label"> <title>Set Label</title> <code>(set-label ${label})</code> - <input type="label" name="label"/> + <input type="optionlist" name="label"> + <dynamic func="e_util_labels_get_filter_options"/> + </input> </part> <part name="colour"> <title>Assign Color</title> diff --git a/mail/message-list.c b/mail/message-list.c index 7333467fd1..70795478bf 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -66,8 +66,6 @@ #include "table/e-cell-vbox.h" #include "table/e-cell-hbox.h" -#include "filter/filter-label.h" - #include "em-popup.h" #include "em-utils.h" #include "mail-config.h" diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml index d48fc251af..ded2e2eabd 100644 --- a/mail/searchtypes.xml +++ b/mail/searchtypes.xml @@ -270,7 +270,9 @@ </code> </option> </input> - <input type="label" name="versus"/> + <input type="optionlist" name="versus"> + <dynamic func="e_util_labels_get_filter_options"/> + </input> </part> <part name="score"> diff --git a/mail/vfoldertypes.xml b/mail/vfoldertypes.xml index f7b4b7d8cd..b87af3280a 100644 --- a/mail/vfoldertypes.xml +++ b/mail/vfoldertypes.xml @@ -353,7 +353,9 @@ </code> </option> </input> - <input type="label" name="versus"/> + <input type="optionlist" name="versus"> + <dynamic func="e_util_labels_get_filter_options"/> + </input> </part> <part name="score"> |