added filter conditions of status such as 'unread', 'mark', 'color-label', and 'mime'.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@905 ee746299-78ed-0310-b773-934348b2243d

2 files changed, 50 insertions, 2 deletions

diff --git a/libsylph/filter.c b/libsylph/filter.c
index 019ad24c..c0bc2aff 100644
--- a/libsylph/filter.c
+++ b/libsylph/filter.c
@@ -1,6 +1,6 @@
 /*
  * LibSylph -- E-Mail client library
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -376,6 +376,18 @@ static gboolean filter_match_cond(FilterCond *cond, MsgInfo *msginfo,
 		matched = (time(NULL) - msginfo->date_t >
 				cond->int_value * 24 * 60 * 60);
 		break;
+	case FLT_COND_UNREAD:
+		matched = MSG_IS_UNREAD(msginfo->flags);
+		break;
+	case FLT_COND_MARK:
+		matched = MSG_IS_MARKED(msginfo->flags);
+		break;
+	case FLT_COND_COLOR_LABEL:
+		matched = (MSG_GET_COLORLABEL_VALUE(msginfo->flags) != 0);
+		break;
+	case FLT_COND_MIME:
+		matched = MSG_IS_MIME(msginfo->flags);
+		break;
 	case FLT_COND_ACCOUNT:
 		cond_ac = account_find_from_id(cond->int_value);
 		matched = (cond_ac != NULL && cond_ac == fltinfo->account);
@@ -595,6 +607,14 @@ static gboolean filter_xml_node_func(GNode *node, gpointer data)
 			cond_type = FLT_COND_SIZE_GREATER;
 		STR_CASE("age")
 			cond_type = FLT_COND_AGE_GREATER;
+		STR_CASE("unread")
+			cond_type = FLT_COND_UNREAD;
+		STR_CASE("mark")
+			cond_type = FLT_COND_MARK;
+		STR_CASE("color-label")
+			cond_type = FLT_COND_COLOR_LABEL;
+		STR_CASE("mime")
+			cond_type = FLT_COND_MIME;
 		STR_CASE("account-id")
 			cond_type = FLT_COND_ACCOUNT;
 		STR_CASE("target-folder")
@@ -842,6 +862,30 @@ void filter_write_file(GSList *list, const gchar *file)
 					 FLT_IS_NOT_MATCH(cond->match_flag)
 					 ? "lt" : "gt");
 				break;
+			case FLT_COND_UNREAD:
+				NODE_NEW("unread", NULL);
+				ADD_ATTR("type",
+					 FLT_IS_NOT_MATCH(cond->match_flag)
+					 ? "is-not" : "is");
+				break;
+			case FLT_COND_MARK:
+				NODE_NEW("mark", NULL);
+				ADD_ATTR("type",
+					 FLT_IS_NOT_MATCH(cond->match_flag)
+					 ? "is-not" : "is");
+				break;
+			case FLT_COND_COLOR_LABEL:
+				NODE_NEW("color-label", NULL);
+				ADD_ATTR("type",
+					 FLT_IS_NOT_MATCH(cond->match_flag)
+					 ? "is-not" : "is");
+				break;
+			case FLT_COND_MIME:
+				NODE_NEW("mime", NULL);
+				ADD_ATTR("type",
+					 FLT_IS_NOT_MATCH(cond->match_flag)
+					 ? "is-not" : "is");
+				break;
 			case FLT_COND_ACCOUNT:
 				 NODE_NEW("account-id", itos(cond->int_value));
 				 break;
diff --git a/libsylph/filter.h b/libsylph/filter.h
index 7144d9cc..b528415b 100644
--- a/libsylph/filter.h
+++ b/libsylph/filter.h
@@ -1,6 +1,6 @@
 /*
  * LibSylph -- E-Mail client library
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -47,6 +47,10 @@ typedef enum
 	FLT_COND_CMD_TEST,
 	FLT_COND_SIZE_GREATER,
 	FLT_COND_AGE_GREATER,
+	FLT_COND_UNREAD,
+	FLT_COND_MARK,
+	FLT_COND_COLOR_LABEL,
+	FLT_COND_MIME,
 	FLT_COND_ACCOUNT
 } FilterCondType;