diff options
author | Dan Vrátil <dvratil@redhat.com> | 2012-03-02 22:35:11 +0800 |
---|---|---|
committer | Dan Vrátil <dvratil@redhat.com> | 2012-03-02 22:35:11 +0800 |
commit | a35b61efa53ef41e049b17d10470b6e8dc62102e (patch) | |
tree | ccc33582704d67779ec8885683661365339868be | |
parent | 9963a852a1db682b6128879f8a01e0287ba00aa4 (diff) | |
download | gsoc2013-evolution-a35b61efa53ef41e049b17d10470b6e8dc62102e.tar.gz gsoc2013-evolution-a35b61efa53ef41e049b17d10470b6e8dc62102e.tar.zst gsoc2013-evolution-a35b61efa53ef41e049b17d10470b6e8dc62102e.zip |
Bug #671211 - 'Mark Citations' preferences not applied
-rw-r--r-- | mail/em-format-html.c | 7 | ||||
-rw-r--r-- | modules/mail/e-mail-config-format-html.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 35fca48c81..74b7f0bda0 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1105,11 +1105,7 @@ efh_init (EMFormatHTML *efh, efh->show_icon = TRUE; efh->state = EM_FORMAT_HTML_STATE_NONE; - g_signal_connect_swapped ( - efh, "notify::mark-citations", - G_CALLBACK (em_format_queue_redraw), NULL); - - e_extensible_load_extensions (E_EXTENSIBLE (efh)); + e_extensible_load_extensions (E_EXTENSIBLE (efh)); } GType @@ -1278,6 +1274,7 @@ em_format_html_set_mark_citations (EMFormatHTML *efh, if (mark_citations) efh->text_html_flags |= CAMEL_MIME_FILTER_TOHTML_MARK_CITATION; + else efh->text_html_flags &= ~CAMEL_MIME_FILTER_TOHTML_MARK_CITATION; diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c index 83bc78f0b2..6f0a1afc49 100644 --- a/modules/mail/e-mail-config-format-html.c +++ b/modules/mail/e-mail-config-format-html.c @@ -51,6 +51,11 @@ mail_config_format_html_constructed (GObject *object) e_binding_transform_string_to_color, NULL, NULL, (GDestroyNotify) NULL); + g_object_bind_property ( + shell_settings, "mail-mark-citations", + extensible, "mark-citations", + G_BINDING_SYNC_CREATE); + g_object_bind_property ( shell_settings, "mail-image-loading-policy", extensible, "image-loading-policy", |