From c868ace2e93942aef027085353bff2bd736584b3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 28 Apr 2009 16:31:45 +0200 Subject: Fix filter breakage after deprecated Gtk+ symbols removal ** Fix for bug #572348 * filter/filter-option.c: (combobox_changed), (get_widget): * mail/em-filter-rule.c: (part_combobox_changed): * mail/em-filter-source-element.c: (source_changed): Fix breakage of filter options. --- mail/ChangeLog | 8 ++++++++ mail/em-filter-rule.c | 2 +- mail/em-filter-source-element.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 97599a4a20..359083a65e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2009-04-28 Milan Crha + + ** Fix for bug #572348 + + * em-filter-rule.c: (part_combobox_changed): + * em-filter-source-element.c: (source_changed): + Fix breakage of filter options. + 2009-04-28 Milan Crha ** Fix for bug #579550 diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 10f06e38da..45dd78c708 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -331,7 +331,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data) int index, i; index = gtk_combo_box_get_active (combobox); - for (i = 0, part = rule_context_next_part (RULE_CONTEXT (data->f), part); part && i < index; i++, part = rule_context_next_part (RULE_CONTEXT (data->f), part)) { + for (i = 0, part = em_filter_context_next_action (data->f, part); part && i < index; i++, part = em_filter_context_next_action (data->f, part)) { /* traverse until reached index */ } diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 096f91b2dd..e35871638f 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -240,7 +240,7 @@ source_changed(GtkComboBox *combobox, EMFilterSourceElement *fs) idx = gtk_combo_box_get_active (combobox); g_return_if_fail (idx >= 0 && idx < g_list_length (fs->priv->sources)); - info = (SourceInfo *) g_list_nth (fs->priv->sources, idx); + info = (SourceInfo *) g_list_nth_data (fs->priv->sources, idx); g_return_if_fail (info != NULL); g_free (fs->priv->current_url); -- cgit v1.2.3