Removed filter-url.[c,h] and filter-system-flag.[c,h]

2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>

	* Makefile.am: Removed filter-url.[c,h] and
	filter-system-flag.[c,h]

	* filter-element.c (filter_element_new_type_name): Removed
	references to the url-type and system-flag types.

	* filtertypes.xml: Removed "source" type and fixed "status" to use
	the optionmenu.

	* filter-url.[c,h]: Removed.

	* filter-system-flag.[c,h]: Removed (just use optionmenu).

svn path=/trunk/; revision=8768

5 files changed, 37 insertions, 32 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index 7e4776dd6f..e3c1086e3d 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,18 @@
+2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* Makefile.am: Removed filter-url.[c,h] and
+	filter-system-flag.[c,h]
+
+	* filter-element.c (filter_element_new_type_name): Removed
+	references to the url-type and system-flag types.
+
+	* filtertypes.xml: Removed "source" type and fixed "status" to use
+	the optionmenu.
+
+	* filter-url.[c,h]: Removed.
+
+	* filter-system-flag.[c,h]: Removed (just use optionmenu).
+
 2001-03-15  Not Zed  <NotZed@Ximian.com>
 
 	* filter.glade: Changed the edit_filter to be a standalone window
diff --git a/filter/Makefile.am b/filter/Makefile.am
index f844559fb4..ba3afe8240 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -49,10 +49,6 @@ libfilter_la_SOURCES =				\
 	filter-rule.h				\
 	filter-score.c				\
 	filter-score.h				\
-	filter-system-flag.c			\
-	filter-system-flag.h			\
-	filter-url.c				\
-	filter-url.h				\
 	rule-context.c				\
 	rule-context.h				\
 	rule-editor.c				\
diff --git a/filter/filter-element.c b/filter/filter-element.c
index 56f47a8161..28841ab837 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -32,9 +32,7 @@
 #include "filter-colour.h"
 #include "filter-datespec.h"
 #include "filter-score.h"
-#include "filter-system-flag.h"
 #include "filter-folder.h"
-#include "filter-url.h"
 
 static gboolean validate (FilterElement *fe);
 static void xml_create(FilterElement *fe, xmlNodePtr node);
@@ -265,12 +263,8 @@ filter_element_new_type_name (const char *type)
 		return (FilterElement *)filter_datespec_new ();
 	} else if (!strcmp (type, "score")) {
 		return (FilterElement *)filter_score_new ();
-	} else if (!strcmp (type, "url")) {
-		return (FilterElement *)filter_url_new ();
 	} else if (!strcmp (type, "regex")) {
 		return (FilterElement *)filter_input_new_type_name (type);
-	} else if (!strcmp (type, "system-flag")) {
-		return (FilterElement *)filter_system_flag_new ();
 	} else {
 		g_warning("Unknown filter type '%s'", type);
 		return 0;
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 6409a3a00c..36d0424e30 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -430,7 +430,23 @@
     </code>
    </option>
   </input>
-  <input type="system-flag" name="flag"/>
+  <input type="optionlist" name="flag">
+   <option value="Answered">
+    <title>Replied to</title>
+   </option>
+   <option value="Deleted">
+    <title>Deleted</title>
+   </option>
+   <option value="Draft">
+    <title>Draft</title>
+   </option>
+   <option value="Flagged">
+    <title>Important</title>
+   </option>
+   <option value="Seen">
+    <title>Read</title>
+   </option>
+  </input>
  </part>
 
  <part name="attachments">
@@ -517,26 +533,6 @@
   <input type="regex" name="expression"/>
  </part>
 
- <part name="source">
-  <title>Source</title>
-  <input type="optionlist" name="url-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-source) ${source}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-source) ${source})))
-    </code>
-   </option>
-  </input>
-  <input type="url" name="source">
-  </input>
- </part>
-
 </partset>
 
 
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index 7ad6fba6bd..3bf6f96f4f 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -9,17 +9,20 @@ char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
+char *s = N_("Deleted");
 char *s = N_("does not contain");
 char *s = N_("does not end with");
 char *s = N_("does not exist");
 char *s = N_("does not sound like");
 char *s = N_("does not start with");
 char *s = N_("Do Not Exist");
+char *s = N_("Draft");
 char *s = N_("ends with");
 char *s = N_("Exist");
 char *s = N_("exists");
 char *s = N_("Expression");
 char *s = N_("Forward to Address");
+char *s = N_("Important");
 char *s = N_("is");
 char *s = N_("is greater than");
 char *s = N_("is less than");
@@ -32,13 +35,14 @@ char *s = N_("Message was sent");
 char *s = N_("Move to Folder");
 char *s = N_("on or after");
 char *s = N_("on or before");
+char *s = N_("Read");
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
+char *s = N_("Replied to");
 char *s = N_("Score");
 char *s = N_("Sender");
 char *s = N_("Set Status");
 char *s = N_("sounds like");
-char *s = N_("Source");
 char *s = N_("Specific header");
 char *s = N_("starts with");
 char *s = N_("Status");