diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-20 07:30:48 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-07 19:09:29 +0800 |
| commit | ffe2f1e1ee96502cf1d3305e16f82d4063fffedc (patch) | |
| tree | fbc9403c4bc56a29ca0b5ce7bf77fea8c6686e2c /mail | |
| parent | 3fb2b21c08556d04770fb585ca303c4044e3c9bc (diff) | |
| download | gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.tar gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.tar.gz gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.tar.bz2 gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.tar.lz gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.tar.xz gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.tar.zst gsoc2013-evolution-ffe2f1e1ee96502cf1d3305e16f82d4063fffedc.zip | |
Add an extension to configure EMFormatHTML.
Make EMFormatHTML extensible and register an extension to automatically
bind every EMFormatHTML instance to the appropriate EShellSettings.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-reader.c | 22 | ||||
| -rw-r--r-- | mail/em-format-html.c | 12 |
2 files changed, 12 insertions, 22 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index ad60195b58..9fe438fb4c 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -2664,32 +2664,10 @@ e_mail_reader_init (EMailReader *reader) /* Bind properties. */ - e_binding_new_full ( - shell_settings, "mail-citation-color", - html_display, "citation-color", - e_binding_transform_string_to_color, - NULL, NULL); - - e_binding_new ( - shell_settings, "mail-image-loading-policy", - html_display, "image-loading-policy"); - - e_binding_new ( - shell_settings, "mail-only-local-photos", - html_display, "only-local-photos"); - e_binding_new ( shell_settings, "mail-show-animated-images", web_view, "animate"); - e_binding_new ( - shell_settings, "mail-show-sender-photo", - html_display, "show-sender-photo"); - - e_binding_new ( - shell_settings, "mail-show-real-date", - html_display, "show-real-date"); - action_name = "mail-caret-mode"; action = e_mail_reader_get_action (reader, action_name); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 26c6f92ff3..7cf5a1f2f6 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -47,6 +47,7 @@ #include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" #include "e-util/e-util.h" +#include "e-util/e-extensible.h" #include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml-stream.h> @@ -965,6 +966,8 @@ efh_init (EMFormatHTML *efh, g_signal_connect_swapped ( efh, "notify::mark-citations", G_CALLBACK (em_format_redraw), NULL); + + e_extensible_load_extensions (E_EXTENSIBLE (efh)); } GType @@ -986,9 +989,18 @@ em_format_html_get_type (void) NULL /* value_table */ }; + static const GInterfaceInfo extensible_info = { + (GInterfaceInitFunc) NULL, + (GInterfaceFinalizeFunc) NULL, + NULL /* interface_data */ + }; + type = g_type_register_static ( em_format_get_type(), "EMFormatHTML", &type_info, G_TYPE_FLAG_ABSTRACT); + + g_type_add_interface_static ( + type, E_TYPE_EXTENSIBLE, &extensible_info); } return type; |