aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog10
-rw-r--r--filter/filter-editor.c4
-rw-r--r--filter/filtertypes.xml22
-rw-r--r--filter/vfoldertypes.xml20
4 files changed, 51 insertions, 5 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index e3c1086e3d..bef78356a1 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * filter-editor.c (filter_editor_construct): Remove the menu that
+ is in the glade file because we want to replace it with our menu,
+ not append items to that menu.
+
+ * filtertypes.xml: Oops, missed the system-flag action-set.
+
+ * vfoldertypes.xml: Update "status" ruleset.
+
2001-03-16 Jeffrey Stedfast <fejj@ximian.com>
* Makefile.am: Removed filter-url.[c,h] and
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 66891e0c2c..800bed9e7f 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -148,7 +148,9 @@ filter_editor_construct(FilterEditor *fe, FilterContext *fc, GladeXML *gui, cons
int i;
omenu = glade_xml_get_widget (gui, "filter_source");
- menu = GTK_OPTION_MENU(omenu)->menu;
+ gtk_option_menu_remove_menu (GTK_OPTION_MENU (omenu));
+ menu = gtk_menu_new ();
+
for (i=0;source_names[i];i++) {
item = gtk_menu_item_new_with_label(_(source_names[i]));
gtk_object_set_data_full(GTK_OBJECT(item), "source", g_strdup(source_names[i]), g_free);
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 36d0424e30..7b168afe8c 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -572,8 +572,26 @@
</part>
<part name="set-status">
<title>Set Status</title>
- <code>(set-system-flag ${flag})</code>
- <input type="system-flag" name="flag"/>
+ <code>
+ (set-system-flag ${flag})
+ </code>
+ <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>
</actionset>
</filterdescription>
diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
index 2b500f83d9..3849635fac 100644
--- a/filter/vfoldertypes.xml
+++ b/filter/vfoldertypes.xml
@@ -265,14 +265,30 @@
(match-all (system-flag ${flag}))
</code>
</option>
- <option value="is-not">
+ <option value="is not">
<title>is not</title>
<code>
(match-all (not (system-flag ${flag})))
</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="mlist">