diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 16 | ||||
| -rw-r--r-- | mail/em-filter-rule.c | 2 | ||||
| -rw-r--r-- | mail/em-filter-source-element.c | 2 | ||||
| -rw-r--r-- | mail/em-format-html.h | 5 | ||||
| -rw-r--r-- | mail/em-format.h | 4 | ||||
| -rw-r--r-- | mail/mail-session.c | 2 |
6 files changed, 27 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 586cb1b7bf..359083a65e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,19 @@ +2009-04-28 Milan Crha <mcrha@redhat.com> + + ** 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 <mcrha@redhat.com> + + ** Fix for bug #579550 + + * mail-session.c: (main_get_filter_driver): + Do not mark messages recognized as junk Seen, to let user notice new + messages in a junk folder. + 2009-04-27 Milan Crha <mcrha@redhat.com> ** Fix for bug #579635 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); diff --git a/mail/em-format-html.h b/mail/em-format-html.h index d35556316a..23e0057f89 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -209,6 +209,11 @@ struct _EMFormatHTML { EMFormat parent; EMFormatHTMLPrivate *priv; +<<<<<<< HEAD:mail/em-format-html.h +======= + EMFormatHTMLPrivate *priv; + +>>>>>>> master:mail/em-format-html.h GtkHTML *html; EDList pending_object_list; diff --git a/mail/em-format.h b/mail/em-format.h index fc29eeaeb4..f262d49be1 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -398,4 +398,6 @@ void em_format_merge_handler (EMFormat *new, G_END_DECLS -#endif /* ! _EM_FORMAT_H */ +G_END_DECLS + +#endif /* EM_FORMAT_H */ diff --git a/mail/mail-session.c b/mail/mail-session.c index 58b675828a..8e7b2177c5 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -548,7 +548,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException if ((!strcmp (type, FILTER_SOURCE_INCOMING) || !strcmp (type, FILTER_SOURCE_JUNKTEST)) && camel_session_check_junk (session)) { /* implicit junk check as 1st rule */ - camel_filter_driver_add_rule (driver, "Junk check", "(junk-test)", "(begin (set-system-flag \"junk\")(set-system-flag \"seen\"))"); + camel_filter_driver_add_rule (driver, "Junk check", "(junk-test)", "(begin (set-system-flag \"junk\"))"); } if (strcmp (type, FILTER_SOURCE_JUNKTEST) != 0) { |