From 1208f96fe41fa87dfab2ee0a3b67a822380aeb27 Mon Sep 17 00:00:00 2001
From: NotZed <NotZed@HelixCode.com>
Date: Sun, 5 Mar 2000 04:26:11 +0000
Subject: Output 'and' bits between the rules.

2000-03-04  NotZed  <NotZed@HelixCode.com>

        * filter-druid.c (html_write_options): Output 'and' bits between
        the rules.

svn path=/trunk/; revision=2056
---
 filter/ChangeLog      | 3 +++
 filter/filter-druid.c | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/filter/ChangeLog b/filter/ChangeLog
index 0c0e7b097b..9b2b4e2fb8 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-04  NotZed  <NotZed@HelixCode.com>
 
+	* filter-druid.c (html_write_options): Output 'and' bits between
+	the rules.
+
 	* filter-driver.c (main): Actually implement filtering, at least,
 	from Inbox.  Copy messages to folder (in the same store only, so
 	far), delete, and stop processing are implemented, and the logic
diff --git a/filter/filter-druid.c b/filter/filter-druid.c
index 4b7951a7c2..5dfd66acca 100644
--- a/filter/filter-druid.c
+++ b/filter/filter-druid.c
@@ -216,6 +216,7 @@ html_write_options(GtkHTML *html, struct filter_option *option, char *def)
 
 		for (i=0;i<sizeof(display_order)/sizeof(display_order[0]);i++) {
 			int doneheader = FALSE;
+			int donefirst = FALSE;
 			optionrulel = option->options;
 			while (optionrulel) {
 				struct filter_optionrule *or = optionrulel->data;
@@ -226,7 +227,11 @@ html_write_options(GtkHTML *html, struct filter_option *option, char *def)
 						doneheader = TRUE;
 					}
 
+					if (donefirst) {
+						gtk_html_write(html, stream, "&nbsp;&nbsp;&nbsp;<i>and</i> ", strlen("&nbsp;&nbsp;&nbsp;<i>and</i> "));
+					}
 					filter_description_html_write(or->rule->description, or->args, html, stream);
+					donefirst = TRUE;
 					gtk_html_write(html, stream, "<br>", strlen("<br>"));
 				}
 				optionrulel = g_list_next(optionrulel);
-- 
cgit v1.2.3