aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog7
-rw-r--r--filter/filter-editor.c6
-rw-r--r--filter/filter.glade2
3 files changed, 11 insertions, 4 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 59fbdab3cc..3262baf2e0 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-23 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * filter-editor.c: Remove the "demand" source from the list.
+
+ * filter.glade: Remove the "On Demand" option and replace it with
+ an "Outgoing" option.
+
2000-10-23 Christopher James Lahey <clahey@helixcode.com>
* filter-editor.c, filter-filter.c, filter-folder.c,
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 681b062e2d..4b86317141 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -147,7 +147,7 @@ rule_add (GtkWidget *widget, struct _editor_data *data)
d(printf ("add rule\n"));
/* create a new rule with 1 match and 1 action */
rule = filter_filter_new ();
- filter_rule_set_source((FilterRule *)rule, data->current_source);
+ filter_rule_set_source ((FilterRule *)rule, data->current_source);
part = rule_context_next_part (data->f, NULL);
filter_rule_add_part ((FilterRule *)rule, filter_part_clone (part));
@@ -363,7 +363,7 @@ select_source (GtkMenuItem *mi, struct _editor_data *data)
static char *source_names[] = {
"incoming",
- "demand",
+ /*"demand",*/
"outgoing"
};
@@ -401,7 +401,7 @@ filter_editor_construct (struct _FilterContext *f)
firstitem = b;
/* make sure that the glade is in sync with the source list! */
- if (i < sizeof(source_names)/sizeof(source_names[0])) {
+ if (i < sizeof (source_names) / sizeof (source_names[0])) {
gtk_object_set_data (GTK_OBJECT (b), "source", source_names[i]);
} else {
g_warning("Glade file " FILTER_GLADEDIR "/filter.glade out of sync with editor code");
diff --git a/filter/filter.glade b/filter/filter.glade
index 5f8a04d64e..c91fdc4958 100644
--- a/filter/filter.glade
+++ b/filter/filter.glade
@@ -75,7 +75,7 @@
<name>filter_source</name>
<can_focus>True</can_focus>
<items>Incoming
-On Demand
+Outgoing
</items>
<initial_choice>0</initial_choice>
<child>