aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog7
-rw-r--r--filter/filter-system-flag.c4
-rw-r--r--filter/filtertypes.xml18
-rw-r--r--filter/libfilter-i18n.h127
4 files changed, 35 insertions, 121 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 768891ac77..b3d403b812 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-12 Jeffrey Stedfast <fejj@ximian.com>
+
+ * filtertypes.xml: Added an "Attachments" filter option where you
+ can filter messages that have (or do not have) attachments. This
+ does not allow you to filter based on the types of the
+ attachments.
+
2001-03-08 Jeffrey Stedfast <fejj@ximian.com>
* vfolder-editor.c (double_click): Make sure we have something
diff --git a/filter/filter-system-flag.c b/filter/filter-system-flag.c
index a74850ded1..724f67cd13 100644
--- a/filter/filter-system-flag.c
+++ b/filter/filter-system-flag.c
@@ -65,8 +65,8 @@ struct _system_flag {
char *value;
} system_flags[] = {
{ N_("Replied to"), "Answered" },
- /*{ _("Deleted"), "Deleted" },*/
- /*{ _("Draft"), "Draft" },*/
+ /*{ N_("Deleted"), "Deleted" },*/
+ /*{ N_("Draft"), "Draft" },*/
{ N_("Important"), "Flagged" },
{ N_("Read"), "Seen" },
{ NULL, NULL }
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 370175785d..6409a3a00c 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -433,6 +433,24 @@
<input type="system-flag" name="flag"/>
</part>
+ <part name="attachments">
+ <title>Attachments</title>
+ <input type="optionlist" name="match-type">
+ <option value="exist">
+ <title>Exist</title>
+ <code>
+ (match-all (system-flag "Attachments"))
+ </code>
+ </option>
+ <option value="not exist">
+ <title>Do Not Exist</title>
+ <code>
+ (match-all (not (system-flag "Attachments")))
+ </code>
+ </option>
+ </input>
+ </part>
+
<part name="mlist">
<title>Mailing list</title>
<input type="optionlist" name="mlist-type">
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index 65e02870d6..7ad6fba6bd 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -1,159 +1,48 @@
/* Automatically generated. Do not edit. */
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
char *s = N_("after");
-=======
-char *s = N_("Answered");
->>>>>>> 1.7
-=======
-char *s = N_("after");
->>>>>>> 1.11
-=======
->>>>>>> 1.13
char *s = N_("Assign Colour");
char *s = N_("Assign Score");
+char *s = N_("Attachments");
+char *s = N_("before");
+char *s = N_("contains");
char *s = N_("Copy to Folder");
char *s = N_("Date received");
char *s = N_("Date sent");
char *s = N_("Delete");
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("Deleted");
-char *s = N_("Draft");
-=======
->>>>>>> 1.13
-char *s = N_("Expression");
-char *s = N_("Flagged");
-char *s = N_("Forward to Address");
-char *s = N_("Mailing list");
-char *s = N_("Message Body");
-char *s = N_("Message Header");
-char *s = N_("Message was received");
-char *s = N_("Message was sent");
-char *s = N_("Move to Folder");
-<<<<<<< libfilter-i18n.h
-char *s = N_("Priority");
-=======
->>>>>>> 1.13
-char *s = N_("Recipients");
-char *s = N_("Regex Match");
-<<<<<<< libfilter-i18n.h
-char *s = N_("Seen");
-=======
-char *s = N_("Score");
->>>>>>> 1.13
-char *s = N_("Sender");
-<<<<<<< libfilter-i18n.h
-char *s = N_("Set Flag");
-=======
-char *s = N_("Set Status");
->>>>>>> 1.13
-char *s = N_("Source");
-char *s = N_("Specific header");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("Status");
->>>>>>> 1.13
-char *s = N_("Stop Processing");
-char *s = N_("Subject");
-<<<<<<< libfilter-i18n.h
-char *s = N_("after");
-char *s = N_("before");
-char *s = N_("contains");
->>>>>>> 1.7
-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_("ends with");
-char *s = N_("exists");
-=======
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_("ends with");
+char *s = N_("Exist");
char *s = N_("exists");
->>>>>>> 1.11
char *s = N_("Expression");
char *s = N_("Forward to Address");
-<<<<<<< libfilter-i18n.h
char *s = N_("is");
char *s = N_("is greater than");
char *s = N_("is less than");
char *s = N_("is not");
-<<<<<<< libfilter-i18n.h
-char *s = N_("matches regex");
-=======
-char *s = N_("is");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
->>>>>>> 1.11
+char *s = N_("Mailing list");
char *s = N_("Message Body");
+char *s = N_("Message Header");
char *s = N_("Message was received");
char *s = N_("Message was sent");
char *s = N_("Move to Folder");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("is");
->>>>>>> 1.8
char *s = N_("on or after");
char *s = N_("on or before");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("on or after");
-char *s = N_("on or before");
->>>>>>> 1.11
-char *s = N_("Priority");
char *s = N_("Recipients");
-<<<<<<< libfilter-i18n.h
-=======
char *s = N_("Regex Match");
->>>>>>> 1.11
+char *s = N_("Score");
char *s = N_("Sender");
-<<<<<<< libfilter-i18n.h
-=======
char *s = N_("Set Status");
char *s = N_("sounds like");
->>>>>>> 1.11
char *s = N_("Source");
char *s = N_("Specific header");
-<<<<<<< libfilter-i18n.h
-=======
-char *s = N_("sounds like");
->>>>>>> 1.7
-char *s = N_("starts with");
-=======
char *s = N_("starts with");
char *s = N_("Status");
->>>>>>> 1.11
char *s = N_("Stop Processing");
char *s = N_("Subject");
-=======
-char *s = N_("after");
-char *s = N_("before");
-char *s = N_("contains");
-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_("ends with");
-char *s = N_("exists");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-char *s = N_("is");
-char *s = N_("on or after");
-char *s = N_("on or before");
-char *s = N_("sounds like");
-char *s = N_("starts with");
->>>>>>> 1.13
char *s = N_("was after");
char *s = N_("was before");