** Fix for bug #563870

2008-12-10  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #563870

	* e-util/e-util-labels.h: (e_util_labels_get_filter_options):
	* e-util/e-util-labels.c: (e_util_labels_get_filter_options):
	New helper function to be used in FilterOption.

	* filter/Makefile.am:
	* filter/filter-label.h:
	* filter/filter-label.c: Drop, not used anywhere.
	* filter/filter-element.c:
	* filter/rule-context.c: Remove dropped include and code.

	* filter/filter-option.c: (get_dynamic_options), (xml_create), (get_widget):
	Evaluate dynamic options even on create, to have them available for
	saved searches even before the widget itself is shown.

	* mail/vfoldertypes.xml:
	* mail/filtertypes.xml:
	* mail/searchtypes.xml: Use dynamic filter option.
	* mail/message-list.c: Drop unused header include.


svn path=/trunk/; revision=36863

1 files changed, 1 insertions, 17 deletions

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