aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog21
-rw-r--r--filter/rule-editor.c4
2 files changed, 17 insertions, 8 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 9786873789..8b3d21dce3 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-28 Jeffrey Stedfast <fejj@ximian.com>
+
+ * rule-editor.c (edit_editor_clicked): Set the item label to the
+ new rule name, not the old rule name. Fixes bug #11168.
+
2001-09-27 <NotZed@Ximian.com>
* vfolder-rule.c (xml_decode): Use g_strdup for the uri, not the
@@ -8,23 +13,27 @@
2001-09-13 <NotZed@Ximian.com>
- * filter-filter.c (filter_filter_add_action):
- (filter_filter_remove_action):
+ * filter-filter.c (filter_filter_add_action):
+ (filter_filter_remove_action):
(filter_filter_replace_action): Emit changed events.
- * filter-rule.c (filter_rule_xml_decode): Emiot a rule changed event.
+ * filter-rule.c (filter_rule_xml_decode): Emiot a rule changed
+ event.
(filter_rule_copy): Emit a changed event.
(filter_rule_replace_part): "
(filter_rule_add_part): "
(filter_rule_remove_part): "
- (filter_rule_xml_decode): Freeze around decoding, so we only emit changed when done.
- (filter_rule_emit_changed): New function to emit changed events if not frozen.
+ (filter_rule_xml_decode): Freeze around decoding, so we only emit
+ changed when done.
+ (filter_rule_emit_changed): New function to emit changed events if
+ not frozen.
2001-09-13 <NotZed@Ximian.com>
* rule-context.c (rule_context_class_init): Added a 'rule_added'
and 'rule_removed' signal.
- (rule_context_load): Set a (private) frozen flag while we're loading.
+ (rule_context_load): Set a (private) frozen flag while we're
+ loading.
(rule_context_add_rule): Emit a rule_added signal if we're not
frozen.
(rule_context_remove_rule): Emit a rule_removed signal if we're
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index e966ef89ad..68b77ab0ae 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -267,8 +267,8 @@ edit_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re)
pos = rule_context_get_rank_rule (re->context, re->current, re->source);
if (pos != -1) {
- item = g_list_nth_data (((GtkList *)re->list)->children, pos);
- string = e_utf8_to_gtk_string (GTK_WIDGET (item), re->current->name);
+ item = g_list_nth_data (GTK_LIST (re->list)->children, pos);
+ string = e_utf8_to_gtk_string (GTK_WIDGET (item), re->edit->name);
gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), string);
g_free (string);